public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trivial-builders.nix: support directories in requireFile

Browse Source 
Allow recursive hash for requireFile so it can support directories (#40568)
This commit is contained in:
Alexandre Esteves 2018-05-16 07:41:13 +01:00 committed by Matthew Justin Bauer
parent 4e891cf4d5
commit d273691f6d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/trivial-builders.nix
View File

@ -138,6 +138,7 @@ rec {
, sha1 ? null , sha1 ? null
, url ? null , url ? null
, message ? null , message ? null
, hashMode ? "flat"
} : } :
assert (message != null) || (url != null); assert (message != null) || (url != null);
assert (sha256 != null) || (sha1 != null); assert (sha256 != null) || (sha1 != null);
@ -158,6 +159,7 @@ rec {
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = name_; name = name_;
outputHashMode = hashMode;
outputHashAlgo = hashAlgo; outputHashAlgo = hashAlgo;
outputHash = hash; outputHash = hash;
preferLocalBuild = true; preferLocalBuild = true;