diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-09 15:50:40 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-09 15:53:44 +0200 |
| commit | ea36f3b86892263d172fa3d0d0d4ae00d82a0edc (patch) | |
| tree | 91862989d1274c3257ea267814eb2bb071a01580 /pkgs/build-support/fetchurl/default.nix | |
| parent | 0d50061b4f9a23d5d2d61404a4d38122603f2b63 (diff) | |
| download | nixlib-ea36f3b86892263d172fa3d0d0d4ae00d82a0edc.tar nixlib-ea36f3b86892263d172fa3d0d0d4ae00d82a0edc.tar.gz nixlib-ea36f3b86892263d172fa3d0d0d4ae00d82a0edc.tar.bz2 nixlib-ea36f3b86892263d172fa3d0d0d4ae00d82a0edc.tar.lz nixlib-ea36f3b86892263d172fa3d0d0d4ae00d82a0edc.tar.xz nixlib-ea36f3b86892263d172fa3d0d0d4ae00d82a0edc.tar.zst nixlib-ea36f3b86892263d172fa3d0d0d4ae00d82a0edc.zip | |
fetchFromGitHub: Use .tar.gz instead of .zip
Also clean up the name attribute of fetchzip derivations a bit.
Diffstat (limited to 'pkgs/build-support/fetchurl/default.nix')
| -rw-r--r-- | pkgs/build-support/fetchurl/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index eac38a773c16..f34640901bbe 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -54,9 +54,6 @@ in # first element of `urls'). name ? "" -, # A string to be appended to the name, if the name is derived from `url'. - nameSuffix ? "" - # Different ways of specifying the hash. , outputHash ? "" , outputHashAlgo ? "" @@ -97,7 +94,7 @@ stdenv.mkDerivation { name = if showURLs then "urls" else if name != "" then name - else baseNameOf (toString (builtins.head urls_)) + nameSuffix; + else baseNameOf (toString (builtins.head urls_)); builder = ./builder.sh; |