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

minimal-bootstrap: be more explicit when declaring "system"

Browse source
This commit is contained in:
Emily Trau 2023-04-30 11:54:39 +10:00
parent a4caff6ea4
commit 7ed2e9a660
9 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,8 @@
lib.makeScope newScope (self: with self; {
callPackage = self.callPackage;
inherit (stdenv.hostPlatform) system;
fetchurl = import ../../../build-support/fetchurl/boot.nix {
inherit system;
inherit (stdenv.buildPlatform) system;
};
inherit (callPackage ./stage0-posix { }) kaem m2libc mescc-tools mescc-tools-extra writeTextFile writeText runCommand;

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

@ -1,5 +1,4 @@
{ lib
, system
, newScope
}:

3
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
View file

@ -1,11 +1,10 @@
{ lib
, derivationWithMeta
, system
, src
, version
}:
derivationWithMeta {
inherit system version;
inherit version;
pname = "hex0";
builder = "${src}/bootstrap-seeds/POSIX/x86/hex0-seed";
args = [

3
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix
View file

@ -1,5 +1,4 @@
{ lib
, system
, derivationWithMeta
, kaem-unwrapped
, mescc-tools-extra
@ -9,7 +8,7 @@
# Once mescc-tools-extra is available we can install kaem at /bin/kaem
# to make it findable in environments
derivationWithMeta {
inherit system version kaem-unwrapped;
inherit version kaem-unwrapped;
pname = "kaem";
builder = kaem-unwrapped;
args = [

3
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix
View file

@ -1,12 +1,11 @@
{ lib
, derivationWithMeta
, system
, src
, hex0
, version
}:
derivationWithMeta {
inherit system version;
inherit version;
pname = "kaem-minimal";
builder = hex0;
args = [

3
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-extra/default.nix
View file

@ -1,5 +1,4 @@
{ lib
, system
, derivationWithMeta
, kaem-unwrapped
, mescc-tools
@ -7,7 +6,7 @@
, version
}:
derivationWithMeta {
inherit system version src mescc-tools;
inherit version src mescc-tools;
pname = "mescc-tools-extra";
builder = kaem-unwrapped;
args = [

5
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools/default.nix
View file

@ -1,5 +1,4 @@
{ lib
, system
, derivationWithMeta
, kaem-unwrapped
, M1
@ -61,7 +60,7 @@ let
-o ''${out}
'')
];
inherit system version M1 M2 blood-elf-0 hex2 m2libc src ARCH BLOOD_FLAG BASE_ADDRESS ENDIAN_FLAG;
inherit version M1 M2 blood-elf-0 hex2 m2libc src ARCH BLOOD_FLAG BASE_ADDRESS ENDIAN_FLAG;
};
@ -79,7 +78,7 @@ derivationWithMeta {
"--file"
./build.kaem
];
inherit system version M1 M2 blood-elf-0 hex2 mkdir cp chmod replace m2libc src ARCH BLOOD_FLAG BASE_ADDRESS ENDIAN_FLAG;
inherit version M1 M2 blood-elf-0 hex2 mkdir cp chmod replace m2libc src ARCH BLOOD_FLAG BASE_ADDRESS ENDIAN_FLAG;
meta = with lib; {
description = "Collection of tools written for use in bootstrapping";

3
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/stage0-posix-x86.nix
View file

@ -29,7 +29,6 @@
{ lib
, derivationWithMeta
, system
, hex0
, m2libc
, src
@ -40,7 +39,7 @@ rec {
run = pname: builder: args:
derivationWithMeta {
inherit system pname version builder args;
inherit pname version builder args;
meta = with lib; {
description = "Collection of tools written for use in bootstrapping";

6
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/utils.nix
View file

@ -1,6 +1,5 @@
{ lib
, stdenv
, system
, callPackage
, fetchurl
, kaem
@ -25,6 +24,7 @@ rec {
validity.handled
({ inherit meta passthru; } // passthru)
(derivation ({
inherit (stdenv.buildPlatform) system;
inherit (meta) name;
} // (builtins.removeAttrs attrs [ "meta" "passthru" ])));
@ -37,7 +37,7 @@ rec {
, preferLocalBuild ? true
}:
derivationWithMeta {
inherit system name text executable allowSubstitutes preferLocalBuild;
inherit name text executable allowSubstitutes preferLocalBuild;
passAsFile = [ "text" ];
builder = kaem-unwrapped;
@ -67,7 +67,7 @@ rec {
runCommand = name: env: buildCommand:
derivationWithMeta ({
inherit name system;
inherit name;
builder = "${kaem}/bin/kaem";
args = [