diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-13 18:24:55 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-13 18:25:52 +0000 |
| commit | 6313a5698a881b99e5aed238b38d05776126623e (patch) | |
| tree | a0bb229c07820ee52d7ee90899dbea97a13d0640 /pkgs/stdenv/linux | |
| parent | 27e5397282c4706d9e4b5229ad1a6d1282073c00 (diff) | |
| download | nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.gz nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.bz2 nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.lz nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.xz nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.zst nixlib-6313a5698a881b99e5aed238b38d05776126623e.zip | |
Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
3 files changed, 3 insertions, 3 deletions
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 { |