diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2018-06-11 12:49:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 12:49:06 -0400 |
| commit | 363363298c95e83c268f3a80c117818169954389 (patch) | |
| tree | 25946add48bf3936fb115566b1900edc2e5ba9a7 /pkgs/build-support/fetchurl/default.nix | |
| parent | f550fa4a72951346493666fea7171732496d2d7f (diff) | |
| parent | f44012ba10537e1a2a94b2be443a86e4dd0ad38f (diff) | |
| download | nixlib-363363298c95e83c268f3a80c117818169954389.tar nixlib-363363298c95e83c268f3a80c117818169954389.tar.gz nixlib-363363298c95e83c268f3a80c117818169954389.tar.bz2 nixlib-363363298c95e83c268f3a80c117818169954389.tar.lz nixlib-363363298c95e83c268f3a80c117818169954389.tar.xz nixlib-363363298c95e83c268f3a80c117818169954389.tar.zst nixlib-363363298c95e83c268f3a80c117818169954389.zip | |
Merge pull request #17757 from copumpkin/fetchurl-user-agent
fetchurl: add user agent
Diffstat (limited to 'pkgs/build-support/fetchurl/default.nix')
| -rw-r--r-- | pkgs/build-support/fetchurl/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 0bf529caa75e..5f0c1384c79e 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -92,7 +92,6 @@ in assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; let - urls_ = if urls != [] && url == "" then (if lib.isList urls then urls @@ -107,7 +106,6 @@ let else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } else if sha1 != "" then { outputHashAlgo = "sha1"; outputHash = sha1; } else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; - in stdenvNoCC.mkDerivation { @@ -135,6 +133,8 @@ stdenvNoCC.mkDerivation { impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; + nixpkgsVersion = lib.trivial.release; + # Doing the download on a remote machine just duplicates network # traffic, so don't do that. preferLocalBuild = true; |