Unverified Commit 1d76b4d7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #227634 from GenericNerdyUsername/requireFile-hash 

`requireFile`: allow using `hash` instead of `sha256`/`sha1`
parents 38594268 3687bee8

pkgs/build-support/trivial-builders.nix

+9 −4
Original line number Diff line number Diff line
@@ -785,12 +785,13 @@ rec { 
  requireFile = { name ? null

                , sha256 ? null

                , sha1 ? null

                , hash ? null

                , url ? null

                , message ? null

                , hashMode ? "flat"

                } :

    assert (message != null) || (url != null);

    assert (sha256 != null) || (sha1 != null);

    assert (sha256 != null) || (sha1 != null) || (hash != null);

    assert (name != null) || (url != null);

    let msg =

      if message != null then message
@@ -802,15 +803,19 @@ rec { 
        or

          nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_}

      '';

      hashAlgo = if sha256 != null then "sha256" else "sha1";

      hash = if sha256 != null then sha256 else sha1;

      hashAlgo = if hash != null then ""

            else if sha256 != null then "sha256"

            else "sha1";

      hash_ = if hash != null then hash

         else if sha256 != null then sha256

         else sha1;

      name_ = if name == null then baseNameOf (toString url) else name;

    in

    stdenvNoCC.mkDerivation {

      name = name_;

      outputHashMode = hashMode;

      outputHashAlgo = hashAlgo;

      outputHash = hash;

      outputHash = hash_;

      preferLocalBuild = true;

      allowSubstitutes = false;

      builder = writeScript "restrict-message" ''