From e433d329583c40f263e34b5fa1c5540a906a915a Mon Sep 17 00:00:00 2001
From: Emily Trau <emily@downunderctf.com>
Date: Mon, 22 May 2023 21:23:55 +1000
Subject: [PATCH 1/2] minimal-bootstrap: remove imports from outside bootstrap

---
 pkgs/os-specific/linux/minimal-bootstrap/default.nix | 6 ++++--
 pkgs/os-specific/linux/minimal-bootstrap/utils.nix   | 9 +--------
 pkgs/top-level/all-packages.nix                      | 4 ++++
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
index 1a5f85e79a1..96f7d63d863 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
@@ -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; };
@@ -41,7 +43,7 @@ lib.makeScope
     tinycc-bootstrappable = callPackage ./tinycc/bootstrappable.nix { };
     tinycc-mes = 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}
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix
index e710c34aa6a..bba6edae973 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix
@@ -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 {};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20ff64f9b3b..c8c05da8c6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27147,6 +27147,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 { };

From bc87c59c15e484a43afc0c2659c0d0c45bc9f78b Mon Sep 17 00:00:00 2001
From: Emily Trau <emily@downunderctf.com>
Date: Mon, 22 May 2023 22:05:21 +1000
Subject: [PATCH 2/2] minimal-bootstrap.mes: remove unused import

---
 pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
index 5886e153bbe..04ab2fdbfaf 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
@@ -1,6 +1,5 @@
 { lib
 , fetchurl
-, writeText
 , callPackage
 , kaem
 , m2libc