diff --git a/doc/default.nix b/doc/default.nix index 6a44587a31b..076703213e4 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -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"; } + '' diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 093e9bcbf10..f9f57424f7d 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,6 +1,6 @@ { nixpkgs }: -with import ./../.. { }; +with import ../.. { }; with lib; stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce95ff39f64..f71cb9079c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix index 70f2de75ae9..9d2fbcbef5c 100644 --- a/pkgs/top-level/guile-2-test.nix +++ b/pkgs/top-level/guile-2-test.nix @@ -4,7 +4,7 @@ -- ludo@gnu.org */ let - allPackages = import ./../..; + allPackages = import ../..; pkgsFun = { system ? builtins.currentSystem }: allPackages { diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 343a3f47a4b..b352ec0fe64 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,5 +1,5 @@ { supportedSystems -, packageSet ? (import ./../..) +, packageSet ? (import ../..) , allowTexliveBuilds ? false , scrubJobs ? true }: diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index cb21a660eb5..0fbd5e50d12 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -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" ] diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 0ccb160e4f6..2774ff66f57 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -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" ] }: diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b596075a2ed..ba99fd5a037 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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" ] diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index aeb36b8edc3..9b8cf5a0309 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -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" ]; };