b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #233391 from emilytrau/minimal-imports

Browse source 
minimal-bootstrap: remove imports from outside bootstrap
This commit is contained in:
John Ericson 2023-05-26 13:17:18 +02:00 committed by GitHub
parent 240d8405b1 bc87c59c15
commit 55358b47b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/os-specific/linux/minimal-bootstrap/default.nix
View file

@ -2,13 +2,15 @@
, config
, buildPlatform
, hostPlatform
, fetchurl
, checkMeta
}:
lib.makeScope
# Prevent using top-level attrs to protect against introducing dependency on
# non-bootstrap packages by mistake. Any top-level inputs must be explicitly
# 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; {
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-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" {} ''
echo ${bash_2_05.tests.get-version}

1
pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
View file

@ -1,6 +1,5 @@
{ lib
, fetchurl
, writeText
, callPackage
, kaem
, m2libc

9
pkgs/os-specific/linux/minimal-bootstrap/utils.nix
View file

@ -3,16 +3,9 @@
, callPackage
, kaem
, mescc-tools-extra
, checkMeta
}:
let
checkMeta = callPackage ../../../stdenv/generic/check-meta.nix { };
in
rec {
fetchurl = import ../../../build-support/fetchurl/boot.nix {
inherit (buildPlatform) system;
};
derivationWithMeta = attrs:
let
passthru = attrs.passthru or {};

4
pkgs/top-level/all-packages.nix
View file

@ -27214,6 +27214,10 @@ with pkgs;
minimal-bootstrap = recurseIntoAttrs (import ../os-specific/linux/minimal-bootstrap {
inherit (stdenv) buildPlatform hostPlatform;
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 { };