aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/strings-with-deps.nix2
-rw-r--r--pkgs/build-support/vm/windows/cygwin-iso/default.nix2
-rw-r--r--pkgs/stdenv/darwin/default.nix4
-rw-r--r--pkgs/stdenv/darwin/make-bootstrap-tools.nix4
-rw-r--r--pkgs/stdenv/freebsd/default.nix4
-rw-r--r--pkgs/stdenv/linux/default.nix2
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix2
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix2
-rw-r--r--pkgs/test/mkOption/keep.nix2
-rw-r--r--pkgs/test/mkOption/merge.nix2
-rw-r--r--pkgs/top-level/all-packages.nix8
-rw-r--r--pkgs/top-level/guile-2-test.nix2
-rw-r--r--pkgs/top-level/make-tarball.nix4
-rw-r--r--pkgs/top-level/release-lib.nix2
-rw-r--r--pkgs/top-level/release-python.nix2
-rw-r--r--pkgs/top-level/release-small.nix2
-rw-r--r--pkgs/top-level/release.nix2
17 files changed, 24 insertions, 24 deletions
diff --git a/lib/strings-with-deps.nix b/lib/strings-with-deps.nix
index bdcc25cbd20c..a901940ac12b 100644
--- a/lib/strings-with-deps.nix
+++ b/lib/strings-with-deps.nix
@@ -15,7 +15,7 @@ Usage:
Attention:
let
- pkgs = (import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix) {};
+ pkgs = (import <nixpkgs>) {};
in let
inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap;
inherit (pkgs.lib) id;
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index b560a850a306..625071c9c33c 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -16,7 +16,7 @@ let
sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv";
};
- cygwinCross = (import ../../../../top-level/all-packages.nix {
+ cygwinCross = (import ../../../../.. {
inherit (stdenv) system;
crossSystem = {
libc = "msvcrt";
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 0af7071e2186..85c406d3703d 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,5 +1,5 @@
{ system ? builtins.currentSystem
-, allPackages ? import ../../top-level/all-packages.nix
+, allPackages ? import ../../..
, platform ? null
, config ? {}
@@ -22,7 +22,7 @@ let
(import "${./standard-sandbox.sb}")
'';
in rec {
- allPackages = import ../../top-level/all-packages.nix;
+ allPackages = import ../../..;
commonPreHook = ''
export NIX_ENFORCE_PURITY=1
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index d9d501ca0f51..b0025351b049 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -1,6 +1,6 @@
{ system ? builtins.currentSystem }:
-with import ../../top-level/all-packages.nix { inherit system; };
+with import ../../.. { inherit system; };
rec {
# We want coreutils without ACL support.
@@ -291,7 +291,7 @@ rec {
# The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
test-pkgs = let
stdenv = import ./. { inherit system bootstrapFiles; };
- in import ../../top-level/all-packages.nix {
+ in import ../../.. {
inherit system;
bootStdenv = stdenv.stdenvDarwin;
};
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 3c4e2bb97661..4c7ebc16239b 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,11 +1,11 @@
{ system ? builtins.currentSystem
-, allPackages ? import ../../top-level/all-packages.nix
+, allPackages ? import ../../..
, platform ? null
, config ? {}
}:
rec {
- allPackages = import ../../top-level/all-packages.nix;
+ allPackages = import ../../..;
bootstrapTools = derivation {
inherit system;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 965188a0cdd8..1135ad78acdc 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -6,7 +6,7 @@
# The function defaults are for easy testing.
{ system ? builtins.currentSystem
-, allPackages ? import ../../top-level/all-packages.nix
+, allPackages ? import ../../..
, platform ? null, config ? {}, lib ? (import ../../../lib)
, customBootstrapFiles ? null }:
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index bf060329be6d..3adb00693f75 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -3,7 +3,7 @@
let buildFor = toolsArch: (
let
- pkgsFun = import ../../top-level/all-packages.nix;
+ pkgsFun = import ../../..;
pkgsNoParams = pkgsFun {};
sheevaplugCrossSystem = {
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 3c8948699726..75dc009f5e67 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -1,6 +1,6 @@
{ system ? builtins.currentSystem }:
-with import ../../top-level/all-packages.nix {inherit system;};
+with import ../../.. {inherit system;};
rec {
diff --git a/pkgs/test/mkOption/keep.nix b/pkgs/test/mkOption/keep.nix
index c26064d89f7e..26fb8c28dd59 100644
--- a/pkgs/test/mkOption/keep.nix
+++ b/pkgs/test/mkOption/keep.nix
@@ -1,5 +1,5 @@
let
- pkgs = import ../../top-level/all-packages.nix {};
+ pkgs = import ../../.. {};
config = import ./declare.nix;
in
with (pkgs.lib);
diff --git a/pkgs/test/mkOption/merge.nix b/pkgs/test/mkOption/merge.nix
index 0d4b3c1acd18..bbf68218aa09 100644
--- a/pkgs/test/mkOption/merge.nix
+++ b/pkgs/test/mkOption/merge.nix
@@ -1,5 +1,5 @@
let
- pkgs = import ../../top-level/all-packages.nix {};
+ pkgs = import ../../.. {};
config = import ./declare.nix;
# Define the handler of unbound options.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e86b3b5894e..163d5cf26bdd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -164,7 +164,7 @@ let
in newpkgs;
# Override system. This is useful to build i686 packages on x86_64-linux.
- forceSystem = system: kernel: (import ./all-packages.nix) {
+ forceSystem = system: kernel: (import ./../..) {
inherit system;
platform = platform // { kernelArch = kernel; };
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
@@ -211,7 +211,7 @@ let
allStdenvs = import ../stdenv {
inherit system platform config lib;
- allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
+ allPackages = args: import ./../.. ({ inherit config system; } // args);
};
defaultStdenv = allStdenvs.stdenv // { inherit platform; };
@@ -228,7 +228,7 @@ let
in if changer != null then
changer {
# We import again all-packages to avoid recursivities.
- pkgs = import ./all-packages.nix {
+ pkgs = import ./../.. {
# We remove packageOverrides to avoid recursivities
config = removeAttrs config [ "replaceStdenv" ];
};
@@ -3843,7 +3843,7 @@ let
# load into the Ben Nanonote
gccCross =
let
- pkgsCross = (import ./all-packages.nix) {
+ 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 802277d474a1..70f2de75ae9e 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 ./all-packages.nix;
+ allPackages = import ./../..;
pkgsFun = { system ? builtins.currentSystem }:
allPackages {
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index ebf19af943f5..ea7e7e89d370 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -48,8 +48,8 @@ releaseTools.sourceTarball rec {
# Make sure that derivation paths do not depend on the Nixpkgs path.
mkdir $TMPDIR/foo
ln -s $(readlink -f .) $TMPDIR/foo/bar
- p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace)
- p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox)
+ p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace)
+ p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox)
if [ "$p1" != "$p2" ]; then
echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
exit 1
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 2f0296223a0e..343a3f47a4b3 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,5 +1,5 @@
{ supportedSystems
-, packageSet ? (import ./all-packages.nix)
+, packageSet ? (import ./../..)
, allowTexliveBuilds ? false
, scrubJobs ? true
}:
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 79bbd9d21a0d..cb21a660eb56 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 ./all-packages.nix {}).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 fbfa4903b45a..9a10fad4e9fe 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 ./all-packages.nix {}).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 6c510ea029f1..b1da5bf30357 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 ./all-packages.nix {}).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" ]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 11:21:02 +0000