Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 }:
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
let buildFor = toolsArch: (
|
||||
|
||||
let
|
||||
pkgsFun = import ../../top-level/all-packages.nix;
|
||||
pkgsFun = import ../../..;
|
||||
pkgsNoParams = pkgsFun {};
|
||||
|
||||
sheevaplugCrossSystem = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ system ? builtins.currentSystem }:
|
||||
|
||||
with import ../../top-level/all-packages.nix {inherit system;};
|
||||
with import ../../.. {inherit system;};
|
||||
|
||||
rec {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user