Unverified Commit 50a11f4f authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #120993 from regnat/easy-ca 

Make the bootsrap respect the contentAddressedByDefault setting
parents 5ba2e4e9 4105c06b

pkgs/stdenv/darwin/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ in rec { 
    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"

  '';



  bootstrapTools = derivation {

  bootstrapTools = derivation ({

    inherit system;



    name    = "bootstrap-tools";
@@ -50,7 +50,11 @@ in rec { 
    inherit (bootstrapFiles) mkdir bzip2 cpio tarball;



    __impureHostDeps = commonImpureHostDeps;

  };

  } // lib.optionalAttrs (config.contentAddressedByDefault or false) {

    __contentAddressed = true;

    outputHashAlgo = "sha256";

    outputHashMode = "recursive";

  });



  stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",

                          overrides         ? (self: super: {}),

pkgs/stdenv/freebsd/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ in 
  ({}: {

    __raw = true;



    bootstrapTools = derivation {

    bootstrapTools = derivation ({

      inherit system;

      inherit make bash coreutils findutils

        diffutils grep patch gawk cpio sed
@@ -182,7 +182,11 @@ in 
      buildInputs = [ make ];

      mkdir = "/bin/mkdir";

      ln = "/bin/ln";

    };

    } // lib.optionalAttrs (config.contentAddressedByDefault or false) {

      __contentAddressed = true;

      outputHashAlgo = "sha256";

      outputHashMode = "recursive";

    });

  })



  ({ bootstrapTools, ... }: rec {

pkgs/stdenv/generic/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ let 
      allowedRequisites = allowedRequisites

        ++ defaultNativeBuildInputs ++ defaultBuildInputs;

    }

    // lib.optionalAttrs (config.contentAddressedByDefault or false) {

      __contentAddressed = true;

      outputHashAlgo = "sha256";

      outputHashMode = "recursive";

    }

    // {

      inherit name;

pkgs/stdenv/linux/bootstrap-tools-musl/default.nix

+3 −3
Original line number Diff line number Diff line 
{ system, bootstrapFiles }:

{ system, bootstrapFiles, extraAttrs }:



derivation {

derivation ({

  name = "bootstrap-tools";



  builder = bootstrapFiles.busybox;
@@ -15,4 +15,4 @@ derivation { 
  langC = true;

  langCC = true;

  isGNU = true;

}
 
} // extraAttrs)

pkgs/stdenv/linux/bootstrap-tools/default.nix

+3 −3
Original line number Diff line number Diff line 
{ system, bootstrapFiles }:

{ system, bootstrapFiles, extraAttrs }:



derivation {

derivation ({

  name = "bootstrap-tools";



  builder = bootstrapFiles.busybox;
@@ -15,4 +15,4 @@ derivation { 
  langC = true;

  langCC = true;

  isGNU = true;

}
 
} // extraAttrs)