Merge staging-next into staging

2021-04-28 18:14:28 +00:00
parent ce47d859f6 5288f79377
commit 9cf0393c37
36 changed files with 602 additions and 537 deletions
@@ -61,7 +61,16 @@ let


  # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
-  bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; };
+  bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) {
+    inherit system bootstrapFiles;
+    extraAttrs = lib.optionalAttrs
+      (config.contentAddressedByDefault or false)
+      {
+        __contentAddressed = true;
+        outputHashAlgo = "sha256";
+        outputHashMode = "recursive";
+      };
+  };

  getLibc = stage: stage.${localSystem.libc};