diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-11T22·53-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-11T22·53-0400 |
| commit | 04559a0d45ad02fc760b09132cca0d875af035e5 (patch) | |
| tree | d7de1301fa9753467781dfc5d931959fcfae34bf /corepkgs | |
| parent | e4d6bcb6cdc34d204ccf49e137dd5070f664c523 (diff) | |
| parent | eae802459d7639a69baec555264f394adad043c0 (diff) | |
Merge branch 'master' of github.com:NixOS/nix into no-manifests
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/Makefile.am | 2 | ||||
| -rw-r--r-- | corepkgs/config.nix.in | 1 | ||||
| -rw-r--r-- | corepkgs/fetchurl.nix | 36 |
3 files changed, 38 insertions, 1 deletions
diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am index a8de601657..729d15e7b1 100644 --- a/corepkgs/Makefile.am +++ b/corepkgs/Makefile.am @@ -1,6 +1,6 @@ all-local: config.nix -files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix unpack-channel.sh derivation.nix +files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix unpack-channel.sh derivation.nix fetchurl.nix install-exec-local: $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs diff --git a/corepkgs/config.nix.in b/corepkgs/config.nix.in index 1be4bd0904..26e821d0e2 100644 --- a/corepkgs/config.nix.in +++ b/corepkgs/config.nix.in @@ -10,5 +10,6 @@ in { xz = "@xz@"; tar = "@tar@"; tr = "@tr@"; + curl = "@curl@"; nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@"; } diff --git a/corepkgs/fetchurl.nix b/corepkgs/fetchurl.nix new file mode 100644 index 0000000000..4a0ae82799 --- /dev/null +++ b/corepkgs/fetchurl.nix @@ -0,0 +1,36 @@ +with import <nix/config.nix>; + +{system ? builtins.currentSystem, url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}: + +assert (outputHash != "" && outputHashAlgo != "") + || md5 != "" || sha1 != "" || sha256 != ""; + +let + + builder = builtins.toFile "fetchurl.sh" + '' + echo "downloading $url into $out" + ${curl} --fail --location --max-redirs 20 --insecure "$url" > "$out" + ''; + +in + +derivation { + name = baseNameOf (toString url); + builder = shell; + args = [ "-e" builder ]; + + # New-style output content requirements. + outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else + if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + outputHash = if outputHash != "" then outputHash else + if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + + inherit system url; + + # No need to double the amount of network traffic + preferLocalBuild = true; + + # Don't build in a chroot because Nix's dependencies may not be there. + __noChroot = true; +} |