Merge pull request #233391 from emilytrau/minimal-imports
minimal-bootstrap: remove imports from outside bootstrap
This commit is contained in:
commit
55358b47b4
|
@ -2,13 +2,15 @@
|
||||||
, config
|
, config
|
||||||
, buildPlatform
|
, buildPlatform
|
||||||
, hostPlatform
|
, hostPlatform
|
||||||
|
, fetchurl
|
||||||
|
, checkMeta
|
||||||
}:
|
}:
|
||||||
|
|
||||||
lib.makeScope
|
lib.makeScope
|
||||||
# Prevent using top-level attrs to protect against introducing dependency on
|
# Prevent using top-level attrs to protect against introducing dependency on
|
||||||
# non-bootstrap packages by mistake. Any top-level inputs must be explicitly
|
# non-bootstrap packages by mistake. Any top-level inputs must be explicitly
|
||||||
# declared here.
|
# declared here.
|
||||||
(extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra))
|
(extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform fetchurl checkMeta; } // extra))
|
||||||
(self: with self; {
|
(self: with self; {
|
||||||
|
|
||||||
bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; };
|
bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; };
|
||||||
|
@ -61,7 +63,7 @@ lib.makeScope
|
||||||
tinycc-bootstrappable = lib.recurseIntoAttrs (callPackage ./tinycc/bootstrappable.nix { });
|
tinycc-bootstrappable = lib.recurseIntoAttrs (callPackage ./tinycc/bootstrappable.nix { });
|
||||||
tinycc-mes = lib.recurseIntoAttrs (callPackage ./tinycc/mes.nix { });
|
tinycc-mes = lib.recurseIntoAttrs (callPackage ./tinycc/mes.nix { });
|
||||||
|
|
||||||
inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText;
|
inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText;
|
||||||
|
|
||||||
test = kaem.runCommand "minimal-bootstrap-test" {} ''
|
test = kaem.runCommand "minimal-bootstrap-test" {} ''
|
||||||
echo ${bash_2_05.tests.get-version}
|
echo ${bash_2_05.tests.get-version}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, writeText
|
|
||||||
, callPackage
|
, callPackage
|
||||||
, kaem
|
, kaem
|
||||||
, m2libc
|
, m2libc
|
||||||
|
|
|
@ -3,16 +3,9 @@
|
||||||
, callPackage
|
, callPackage
|
||||||
, kaem
|
, kaem
|
||||||
, mescc-tools-extra
|
, mescc-tools-extra
|
||||||
|
, checkMeta
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
checkMeta = callPackage ../../../stdenv/generic/check-meta.nix { };
|
|
||||||
in
|
|
||||||
rec {
|
rec {
|
||||||
fetchurl = import ../../../build-support/fetchurl/boot.nix {
|
|
||||||
inherit (buildPlatform) system;
|
|
||||||
};
|
|
||||||
|
|
||||||
derivationWithMeta = attrs:
|
derivationWithMeta = attrs:
|
||||||
let
|
let
|
||||||
passthru = attrs.passthru or {};
|
passthru = attrs.passthru or {};
|
||||||
|
|
|
@ -27214,6 +27214,10 @@ with pkgs;
|
||||||
minimal-bootstrap = recurseIntoAttrs (import ../os-specific/linux/minimal-bootstrap {
|
minimal-bootstrap = recurseIntoAttrs (import ../os-specific/linux/minimal-bootstrap {
|
||||||
inherit (stdenv) buildPlatform hostPlatform;
|
inherit (stdenv) buildPlatform hostPlatform;
|
||||||
inherit lib config;
|
inherit lib config;
|
||||||
|
fetchurl = import ../build-support/fetchurl/boot.nix {
|
||||||
|
inherit (stdenv.buildPlatform) system;
|
||||||
|
};
|
||||||
|
checkMeta = callPackage ../stdenv/generic/check-meta.nix { };
|
||||||
});
|
});
|
||||||
|
|
||||||
mingetty = callPackage ../os-specific/linux/mingetty { };
|
mingetty = callPackage ../os-specific/linux/mingetty { };
|
||||||
|
|
Loading…
Reference in a new issue