Replace ./../*
with ../*
in Nix expressions (#16414)
This commit is contained in:
parent
48f1d9c483
commit
f073df60d6
@ -57,11 +57,11 @@ stdenv.mkDerivation {
|
||||
outputFile = "./languages-frameworks/haskell.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./../pkgs/development/idris-modules/README.md;
|
||||
inputFile = ../pkgs/development/idris-modules/README.md;
|
||||
outputFile = "languages-frameworks/idris.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./../pkgs/development/r-modules/README.md;
|
||||
inputFile = ../pkgs/development/r-modules/README.md;
|
||||
outputFile = "languages-frameworks/r.xml";
|
||||
}
|
||||
+ ''
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ nixpkgs }:
|
||||
|
||||
with import ./../.. { };
|
||||
with import ../.. { };
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
@ -43,7 +43,7 @@ in
|
||||
overridePackages = f: pkgsWithOverrides f;
|
||||
|
||||
# Override system. This is useful to build i686 packages on x86_64-linux.
|
||||
forceSystem = system: kernel: (import ./../..) {
|
||||
forceSystem = system: kernel: (import ../..) {
|
||||
inherit system;
|
||||
platform = platform // { kernelArch = kernel; };
|
||||
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
|
||||
@ -3945,7 +3945,7 @@ in
|
||||
# load into the Ben Nanonote
|
||||
gccCross =
|
||||
let
|
||||
pkgsCross = (import ./../..) {
|
||||
pkgsCross = (import ../..) {
|
||||
inherit system;
|
||||
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
|
||||
# Ben Nanonote system
|
||||
|
@ -4,7 +4,7 @@
|
||||
-- ludo@gnu.org */
|
||||
|
||||
let
|
||||
allPackages = import ./../..;
|
||||
allPackages = import ../..;
|
||||
|
||||
pkgsFun = { system ? builtins.currentSystem }:
|
||||
allPackages {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ supportedSystems
|
||||
, packageSet ? (import ./../..)
|
||||
, packageSet ? (import ../..)
|
||||
, allowTexliveBuilds ? false
|
||||
, scrubJobs ? true
|
||||
}:
|
||||
|
@ -3,7 +3,7 @@
|
||||
$ hydra-eval-jobs pkgs/top-level/release-python.nix
|
||||
*/
|
||||
|
||||
{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
||||
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
||||
, officialRelease ? false
|
||||
, # The platforms for which we build Nixpkgs.
|
||||
supportedSystems ? [ "x86_64-linux" ]
|
||||
|
@ -1,7 +1,7 @@
|
||||
/* A small release file, with few packages to be built. The aim is to reduce
|
||||
the load on Hydra when testing the `stdenv-updates' branch. */
|
||||
|
||||
{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
||||
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
||||
, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
|
||||
}:
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
|
||||
*/
|
||||
|
||||
{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
||||
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
|
||||
, officialRelease ? false
|
||||
, # The platforms for which we build Nixpkgs.
|
||||
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
|
||||
|
@ -6,7 +6,7 @@ with super;
|
||||
rec {
|
||||
allStdenvs = import ../stdenv {
|
||||
inherit system platform config lib;
|
||||
allPackages = args: import ./../.. ({ inherit config system; } // args);
|
||||
allPackages = args: import ../.. ({ inherit config system; } // args);
|
||||
};
|
||||
|
||||
defaultStdenv = allStdenvs.stdenv // { inherit platform; };
|
||||
@ -21,7 +21,7 @@ rec {
|
||||
in if changer != null then
|
||||
changer {
|
||||
# We import again all-packages to avoid recursivities.
|
||||
pkgs = import ./../.. {
|
||||
pkgs = import ../.. {
|
||||
# We remove packageOverrides to avoid recursivities
|
||||
config = removeAttrs config [ "replaceStdenv" ];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user