diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-27 18:59:19 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-27 18:59:19 +0000 |
commit | 952bc80b4d960d65c49e5f2eb9be0415808bbc9b (patch) | |
tree | 587adfadde20b2fa0341d9d261090a29d298412b | |
parent | 25a7c36007953bf98f65873db5a75b60d39d19c7 (diff) | |
download | nixlib-952bc80b4d960d65c49e5f2eb9be0415808bbc9b.tar nixlib-952bc80b4d960d65c49e5f2eb9be0415808bbc9b.tar.gz nixlib-952bc80b4d960d65c49e5f2eb9be0415808bbc9b.tar.bz2 nixlib-952bc80b4d960d65c49e5f2eb9be0415808bbc9b.tar.lz nixlib-952bc80b4d960d65c49e5f2eb9be0415808bbc9b.tar.xz nixlib-952bc80b4d960d65c49e5f2eb9be0415808bbc9b.tar.zst nixlib-952bc80b4d960d65c49e5f2eb9be0415808bbc9b.zip |
Let fetchurl retry failed downloads. Add NIX_CURL_FLAGS impure var
svn path=/nixpkgs/trunk/; revision=22006
-rw-r--r-- | pkgs/build-support/fetchurl/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/build-support/fetchurl/default.nix | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 22ba25e90a4f..1682dc63392d 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -13,9 +13,11 @@ fi # cryptographic hash of the output anyway). curl="curl \ --location --max-redirs 20 \ + --retry 3 --disable-epsv \ --cookie-jar cookies \ - --insecure" + --insecure \ + $NIX_CURL_OPTIONS" tryDownload() { diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 1ba9124027d4..62f6fb2acf4b 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -91,6 +91,9 @@ stdenv.mkDerivation { # by definition pure. "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + # This variable allows the user to pass additional options to curl + "NIX_CURL_FLAGS" + # This variable allows the user to override hashedMirrors from the # command-line. "NIX_HASHED_MIRRORS" |