From 1a0bdc0de1bad45adb17f1706f34bda6c8abdf06 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 03:16:56 -0800
Subject: [PATCH 01/10] stdenv: add rebootstrap parameter

---
 pkgs/stdenv/cross/default.nix   |  3 +++
 pkgs/stdenv/custom/default.nix  |  3 +++
 pkgs/stdenv/darwin/default.nix  |  2 ++
 pkgs/stdenv/default.nix         |  7 +++++++
 pkgs/stdenv/freebsd/default.nix |  3 +++
 pkgs/stdenv/linux/default.nix   | 32 ++++++++++++++++++++------------
 pkgs/stdenv/native/default.nix  |  2 ++
 7 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index bf410ec0a6841..ddafa3d2c9aeb 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,7 +1,10 @@
 { lib
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
+, rebootstrap ? false
 }:
 
+assert rebootstrap -> throw "bootstrapping is irrelevant to stdenv/cross";
+
 let
   bootStages = import ../. {
     inherit lib localSystem overlays;
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index 4c7380118f7d5..9fc4a069f0c65 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -1,7 +1,10 @@
 { lib
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
+, rebootstrap ? false
 }:
 
+assert rebootstrap -> throw "bootstrapping is not relevant to stdenv/custom";
+
 assert crossSystem == localSystem;
 
 let
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 76c44870f4ad6..aad704f324d20 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -34,9 +34,11 @@
       cpio = fetch { file = "cpio"; sha256 = "sha256-SWkwvLaFyV44kLKL2nx720SvcL4ej/p2V/bX3uqAGO0="; };
       tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kRC/bhCmlD4L7KAvJQgcukk7AinkMz4IwmG1rqlh5tA="; executable = false; };
     }
+, rebootstrap ? false
 }:
 
 assert crossSystem == localSystem;
+assert rebootstrap -> throw "darwin does not yet support automatic rebootstrapping";
 
 let
   inherit (localSystem) system;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 7a2ad665e09d7..ccee907f8bb60 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -8,6 +8,13 @@
   lib
   # Args to pass on to the pkgset builder, too
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
+
+# If true, the bootstrapFiles will be rebuilt, resulting in a stdenv
+# built by the same compiler as its bootstrap tools.  Turning this
+# feature on will considerably increase the rebuild cycle, but may
+# help with troubleshooting the bootstrap.
+, rebootstrap ? false
+
 } @ args:
 
 let
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index de66085876052..3eafa152302c8 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,7 +1,10 @@
 { lib
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
+, rebootstrap ? false
 }:
 
+assert rebootstrap -> throw "stdenv/freebsd does not yet support automatic rebootstrapping";
+
 assert crossSystem == localSystem;
 let inherit (localSystem) system;
     fetchURL = import <nix/fetchurl.nix>;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 870fb04c3883f..d1d8475d02277 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -58,7 +58,7 @@
 #     $ nix-tree --derivation $(nix-instantiate -A stdenv)
 { lib
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
-
+, rebootstrap ? false
 , bootstrapFiles ?
   let table = {
     glibc = {
@@ -93,7 +93,7 @@
   files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools
     else (abort "unsupported platform for the pure Linux stdenv"));
   in files
-}:
+} @args:
 
 assert crossSystem == localSystem;
 
@@ -117,7 +117,7 @@ let
 
 
   # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
-  bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) {
+  unpackBootstrapTools = bootstrapFiles: import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) {
     inherit system bootstrapFiles;
     extraAttrs = lib.optionalAttrs
       config.contentAddressedByDefault
@@ -135,10 +135,9 @@ let
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun = prevStage:
-    { name, overrides ? (self: super: {}), extraNativeBuildInputs ? [] }:
+    { name, overrides ? (self: super: {}), extraNativeBuildInputs ? [], bootstrapTools ? prevStage.bootstrapTools }:
 
     let
-
       thisStdenv = import ../generic {
         name = "${name}-stdenv-linux";
         buildPlatform = localSystem;
@@ -177,9 +176,11 @@ let
           stdenvNoCC = prevStage.ccWrapperStdenv;
         };
 
-        overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
+        overrides = self: super: (overrides self super) // {
+          fetchurl = thisStdenv.fetchurlBoot;
+          inherit bootstrapTools;
+        };
       };
-
     in {
       inherit config overlays;
       stdenv = thisStdenv;
@@ -187,15 +188,22 @@ let
 
 in
 
-[
+# when rebootstrapping, we first prepend a copy of the stdenv stages
+# that use the fetched bootstrapFiles:
+lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
 
-  ({}: {
+[
+  (prevStage: {
     __raw = true;
-
     gcc-unwrapped = null;
     binutils = null;
     coreutils = null;
     gnugrep = null;
+    bootstrapTools =
+      unpackBootstrapTools
+        (if   rebootstrap
+         then prevStage.freshBootstrapTools.bootstrapFiles
+         else bootstrapFiles);
   })
 
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
@@ -203,7 +211,7 @@ in
   #
   # resulting stage0 stdenv:
   # - coreutils, binutils, glibc, gcc: from bootstrapFiles
-  (prevStage: stageFun prevStage {
+  ({ bootstrapTools, ...}@prevStage: stageFun prevStage {
     name = "bootstrap-stage0";
 
     overrides = self: super: {
@@ -477,7 +485,7 @@ in
   #        and the bootstrapTools-built, statically-linked
   #        lib{mpfr,mpc,gmp,isl}.a which are linked into the final gcc
   #        (see commit cfde88976ba4cddd01b1bb28b40afd12ea93a11d).
-  (prevStage: {
+  ({ bootstrapTools, ...}@prevStage: {
     inherit config overlays;
     stdenv = import ../generic rec {
       name = "stdenv-linux";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 87862b84bc1b2..c50799db1e51d 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,8 +1,10 @@
 { lib
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
+, rebootstrap
 }:
 
 assert crossSystem == localSystem;
+assert rebootstrap -> throw "stdenv/native does not yet support automatic rebootstrapping";
 
 let
   inherit (localSystem) system;

From 12408bcf9336f7817a10953e9f0b932031f1f297 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 03:35:10 -0800
Subject: [PATCH 02/10] aarch64: enable rebootstrap, upgrade to gcc11

Incorporates changes from:

- https://github.com/NixOS/nixpkgs/pull/209459

Should fix:

- https://github.com/NixOS/nixpkgs/issues/108111
- https://github.com/NixOS/nixpkgs/issues/108305
- https://github.com/NixOS/nixpkgs/issues/201254

Alternative to:

- https://github.com/NixOS/nixpkgs/pull/209063
---
 pkgs/stdenv/linux/default.nix   | 10 +++++++++-
 pkgs/top-level/all-packages.nix |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index d1d8475d02277..eb7f97ac18a30 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -58,7 +58,15 @@
 #     $ nix-tree --derivation $(nix-instantiate -A stdenv)
 { lib
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
-, rebootstrap ? false
+
+# ARMv8.0 backward compatibility (`-moutline-intrinsics`) currently
+# requires regenerating bootstrapFiles; see:
+#
+#   https://github.com/NixOS/nixpkgs/issues/108111
+#   https://github.com/NixOS/nixpkgs/pull/108200
+#   https://bugzilla.redhat.com/show_bug.cgi?id=1830472
+, rebootstrap ? localSystem.isAarch64
+
 , bootstrapFiles ?
   let table = {
     glibc = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4dc26675b41f..c49af2dfcb39b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14052,7 +14052,6 @@ with pkgs;
   inherit (let
       num =
         if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6
-        else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9
         else 11;
       numS = toString num;
     in {

From e0ccba713493dc6482ead6df1dc912d045469f07 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 16:46:14 -0800
Subject: [PATCH 03/10] stdenv: mark binutils-patchelfed

The stdenv bootstrap creates several wrappers around binutils, and
gives them the exact same drvName as the binutils package itself.

These wrappers cost almost nothing to create (they are just file
copies and patchelf runs, not builds), so we should distinguish them
from expensive binutils builds with a unique pname.  This commit
does that.
---
 pkgs/stdenv/linux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index eb7f97ac18a30..cfb18d46a0b25 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -348,7 +348,8 @@ lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
         # and that can fail to load.  Therefore we upgrade `ld` to use newer libc;
         # apparently the interpreter needs to match libc, too.
         bintools = self.stdenvNoCC.mkDerivation {
-          inherit (prevStage.bintools.bintools) name;
+          pname = prevStage.bintools.bintools.pname + "-patchelfed";
+          inherit (prevStage.bintools.bintools) version;
           enableParallelBuilding = true;
           dontUnpack = true;
           dontBuild = true;

From 4837fb4c4fc911070c5e7aaa0d8ed9c7cad30dd4 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 12:31:12 -0800
Subject: [PATCH 04/10] make-bootstrap-tools.nix: allow to override bootGCC and
 busyboxMinimal

---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index c6112766781ee..ef8e525ff3e02 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -1,4 +1,20 @@
-{ pkgs ? import ../../.. {} }:
+{ pkgs ? import ../../.. {}
+, busyboxMinimal ? "${pkgs.busybox.override {
+    useMusl = !pkgs.stdenv.targetPlatform.isRiscV;
+    enableStatic = true;
+    enableMinimal = true;
+    extraConfig = ''
+      CONFIG_ASH y
+      CONFIG_ASH_ECHO y
+      CONFIG_ASH_TEST y
+      CONFIG_ASH_OPTIMIZE_FOR_SIZE y
+      CONFIG_MKDIR y
+      CONFIG_TAR y
+      CONFIG_UNXZ y
+    '';
+  }}/bin/busybox"
+, bootGCC ? pkgs.gcc.cc.override { enableLTO = false; }
+}:
 
 let
   libc = pkgs.stdenv.cc.libc;
@@ -15,22 +31,6 @@ in with pkgs; rec {
 
   tarMinimal = gnutar.override { acl = null; };
 
-  busyboxMinimal = busybox.override {
-    useMusl = !stdenv.targetPlatform.isRiscV;
-    enableStatic = true;
-    enableMinimal = true;
-    extraConfig = ''
-      CONFIG_ASH y
-      CONFIG_ASH_ECHO y
-      CONFIG_ASH_TEST y
-      CONFIG_ASH_OPTIMIZE_FOR_SIZE y
-      CONFIG_MKDIR y
-      CONFIG_TAR y
-      CONFIG_UNXZ y
-    '';
-  };
-
-  bootGCC = gcc.cc.override { enableLTO = false; };
   bootBinutils = binutils.bintools.override {
     withAllTargets = false;
     # Don't need two linkers, disable whatever's not primary/default.
@@ -196,7 +196,7 @@ in with pkgs; rec {
 
         mkdir $out/on-server
         XZ_OPT="-9 -e" tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .
-        cp ${busyboxMinimal}/bin/busybox $out/on-server
+        cp ${busyboxMinimal} $out/on-server/busybox
         chmod u+w $out/on-server/busybox
         nuke-refs $out/on-server/busybox
       ''; # */

From b5c952bd23d375125e9fa5423f94481e96631840 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 12:32:10 -0800
Subject: [PATCH 05/10] stdenv/linux: avoid unnecessary rebuilds when
 rebootstrapping

---
 pkgs/stdenv/linux/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index cfb18d46a0b25..6fcea6db14b92 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -210,8 +210,15 @@ lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
     bootstrapTools =
       unpackBootstrapTools
         (if   rebootstrap
-         then prevStage.freshBootstrapTools.bootstrapFiles
-         else bootstrapFiles);
+         then (prevStage.freshBootstrapTools.override {
+           # Copy busybox from the original bootstrapFiles; it is
+           # safe to do this because it is statically linked.  This
+           # avoids having to rebuild a musl-gcc compiler (glibc
+           # doesn't know how to do static linking).
+           busyboxMinimal = prevStage.stdenv.bootstrapFiles.busybox;
+           # don't rebuild a custom compiler
+           bootGCC = prevStage.gcc.cc;
+         }).bootstrapFiles else bootstrapFiles);
   })
 
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
@@ -521,7 +528,7 @@ lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
       inherit (prevStage.stdenv) fetchurlBoot;
 
       extraAttrs = {
-        inherit bootstrapTools;
+        inherit bootstrapTools bootstrapFiles;
         shellPackage = prevStage.bash;
       };
 

From 201d526d7073576170a8856f13f5d64ec03bf8af Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 16:36:38 -0800
Subject: [PATCH 06/10] gcc11: allow compilation without libxcrypt

---
 pkgs/development/compilers/gcc/11/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix
index de764b9ccc7c2..429ac9df902da 100644
--- a/pkgs/development/compilers/gcc/11/default.nix
+++ b/pkgs/development/compilers/gcc/11/default.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation ({
   preConfigure = (import ../common/pre-configure.nix {
     inherit lib;
     inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
-  }) + ''
+  }) + lib.optionalString (libxcrypt!=null) ''
     ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
   '';
 

From 53c7484e69b5ed143023a972c4033b0d74d91681 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 16:36:51 -0800
Subject: [PATCH 07/10] perl: allow compilation without libxcrypt

---
 pkgs/development/interpreters/perl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 4d95ebf2052bf..b35c7b6e9b322 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,7 +1,7 @@
 { config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages
 , callPackage
 , enableThreading ? true, coreutils, makeWrapper
-, enableCrypt ? true, libxcrypt ? null
+, enableCrypt ? libxcrypt!=null, libxcrypt ? null
 , zlib
 }:
 

From 31127c42e23b9334e8aa312ca86a4013704ad4d9 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 16:37:03 -0800
Subject: [PATCH 08/10] cpython: allow compilation without libxcrypt

---
 pkgs/development/interpreters/python/cpython/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 388802fca8c66..3a85582c10bca 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -384,7 +384,7 @@ in with passthru; stdenv.mkDerivation {
 
   postInstall = let
     # References *not* to nuke from (sys)config files
-    keep-references = concatMapStringsSep " " (val: "-e ${val}") ([
+    keep-references = concatMapStringsSep " " (val: "-e ${val}") (optionals (libxcrypt!=null) [
       (placeholder "out") libxcrypt
     ] ++ optionals tzdataSupport [
       tzdata

From 8d0d8e7297bc0237b8cd10d3fc20b68c5b6359c1 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 16:38:08 -0800
Subject: [PATCH 09/10] make-bootstrap-tools: take coreutilsMinimal, cpio from
 pkgs

---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 14 +++++---------
 pkgs/top-level/all-packages.nix            |  7 +++++++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index ef8e525ff3e02..4f9d65e8f118f 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -14,20 +14,16 @@
     '';
   }}/bin/busybox"
 , bootGCC ? pkgs.gcc.cc.override { enableLTO = false; }
+, nukeReferences ? pkgs.buildPackages.nukeReferences
+, cpio ? pkgs.buildPackages.cpio
+, rebootstrap ? false
 }:
 
 let
   libc = pkgs.stdenv.cc.libc;
 in with pkgs; rec {
 
-
-  coreutilsMinimal = coreutils.override (args: {
-    # We want coreutils without ACL/attr support.
-    aclSupport = false;
-    attrSupport = false;
-    # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
-    singleBinary = "symlinks";
-  });
+  inherit (pkgs) coreutilsMinimal;
 
   tarMinimal = gnutar.override { acl = null; };
 
@@ -50,7 +46,7 @@ in with pkgs; rec {
         schedulingPriority = 200;
       };
 
-      nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ];
+      nativeBuildInputs = [ nukeReferences cpio ];
 
       buildCommand = ''
         set -x
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c49af2dfcb39b..b4f0ce16e2924 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6139,6 +6139,13 @@ with pkgs;
   coreutils =  callPackage ../tools/misc/coreutils { };
   coreutils-full = coreutils.override { minimal = false; };
   coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };
+  coreutilsMinimal = callPackage ../tools/misc/coreutils {  # this is for the bootstrapFiles
+    # We want coreutils without ACL/attr support.
+    aclSupport = false;
+    attrSupport = false;
+    # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
+    singleBinary = "symlinks";
+  };
 
   corkscrew = callPackage ../tools/networking/corkscrew { };
 

From 77c21730c6ce6a0476803978c3e3781112b850e5 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 7 Jan 2023 16:48:03 -0800
Subject: [PATCH 10/10] stdenv: add minimal flag

---
 pkgs/stdenv/linux/default.nix | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 6fcea6db14b92..5eb03f3dd8d4e 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -67,6 +67,8 @@
 #   https://bugzilla.redhat.com/show_bug.cgi?id=1830472
 , rebootstrap ? localSystem.isAarch64
 
+, minimal ? false
+
 , bootstrapFiles ?
   let table = {
     glibc = {
@@ -198,7 +200,19 @@ in
 
 # when rebootstrapping, we first prepend a copy of the stdenv stages
 # that use the fetched bootstrapFiles:
-lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
+lib.optionals rebootstrap (import ./. (args // {
+  rebootstrap = false;
+  minimal = true;
+  overlays = overlays ++ [ (final: prev: {
+    gettext = null;
+    help2man = null;
+    texinfo = null;
+    python3Minimal = null;
+    python3 = null;
+    libxcrypt = null;
+    coreutils = prev.coreutilsMinimal;
+  }) ];
+})) ++
 
 [
   (prevStage: {
@@ -218,6 +232,7 @@ lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
            busyboxMinimal = prevStage.stdenv.bootstrapFiles.busybox;
            # don't rebuild a custom compiler
            bootGCC = prevStage.gcc.cc;
+           nukeReferences = prevStage.nukeReferences.override { perl = prevStage.stdenv.bootstrapTools; };
          }).bootstrapFiles else bootstrapFiles);
   })
 
@@ -267,6 +282,8 @@ lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
       };
       coreutils = bootstrapTools;
       gnugrep = bootstrapTools;
+    } // lib.optionalAttrs minimal {
+      nukeReferences = prevStage.nukeReferences.override { perl = prevStage.bootstrapTools; };
     };
   })
 
@@ -303,7 +320,7 @@ lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
       # This is not an issue for the final stdenv, because this perl
       # won't be included in the final stdenv and won't be exported to
       # top-level pkgs as an override either.
-      perl = super.perl.override { enableThreading = false; enableCrypt = false; };
+      perl = if minimal then prevStage.bootstrapTools else super.perl.override { enableThreading = false; enableCrypt = false; };
     };
   })
 
@@ -568,7 +585,12 @@ lib.optionals rebootstrap (import ./. (args // { rebootstrap = false; })) ++
           inherit (self) stdenv runCommandLocal patchelf libunistring;
         };
 
+      } // lib.optionalAttrs (!minimal) {
         gnumake = super.gnumake.override { inBootstrap = false; };
+      } // lib.optionalAttrs minimal {
+        fetchurl = prevStage.stdenv.fetchurlBoot;
+        cpio = prevStage.bootstrapTools;
+        nukeReferences = prevStage.nukeReferences.override { perl = prevStage.bootstrapTools; };
       } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
         # Need to get rid of these when cross-compiling.
         inherit (prevStage) binutils binutils-unwrapped;