lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

corepkgs/fetchurl: Enable making the downloaded file executable

Browse source
This commit is contained in:
Shea Levy 2013-01-18 19:59:23 -05:00 committed by Eelco Dolstra
parent 536c85ea49
commit d6fd6d8aff
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
corepkgs/fetchurl.nix
View file

@ -1,6 +1,6 @@
with import <nix/config.nix>; with import <nix/config.nix>;
{system ? builtins.currentSystem, url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}: {system ? builtins.currentSystem, url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? "", executable ? false}:
assert (outputHash != "" && outputHashAlgo != "") assert (outputHash != "" && outputHashAlgo != "")
|| md5 != "" || sha1 != "" || sha256 != ""; || md5 != "" || sha1 != "" || sha256 != "";
@ -8,10 +8,10 @@ assert (outputHash != "" && outputHashAlgo != "")
let let
builder = builtins.toFile "fetchurl.sh" builder = builtins.toFile "fetchurl.sh"
'' (''
echo "downloading $url into $out" echo "downloading $url into $out"
${curl} --fail --location --max-redirs 20 --insecure "$url" > "$out" ${curl} --fail --location --max-redirs 20 --insecure "$url" > "$out"
''; '' + (if executable then "${coreutils}/chmod +x $out" else ""));
in in
@ -25,6 +25,7 @@ derivation {
if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
outputHash = if outputHash != "" then outputHash else outputHash = if outputHash != "" then outputHash else
if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
outputHashMode = if executable then "recursive" else "flat";
inherit system url; inherit system url;