public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetchurl: Don't wait too long for the hashed mirrors

Browse Source 
If the hashed mirror (nixos.org/tarballs) doesn't respond in 15
seconds, give up and try the original URL.
This commit is contained in:
Eelco Dolstra 2013-02-06 15:15:28 +01:00
parent f337ab4430
commit 04765da09a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/fetchurl/builder.sh
View File

@ -41,7 +41,8 @@ tryHashedMirrors() {
for mirror in $hashedMirrors; do for mirror in $hashedMirrors; do
url="$mirror/$outputHashAlgo/$outputHash" url="$mirror/$outputHashAlgo/$outputHash"
if $curl --fail --silent --show-error --head "$url" \ if $curl --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \
--fail --silent --show-error --head "$url" \
--write-out "%{http_code}" --output /dev/null > code 2> log; then --write-out "%{http_code}" --output /dev/null > code 2> log; then
tryDownload "$url" tryDownload "$url"
if test -n "$success"; then finish; fi if test -n "$success"; then finish; fi

4
pkgs/build-support/fetchurl/default.nix
View File

@ -32,6 +32,10 @@ let
# This variable allows the user to override hashedMirrors from the # This variable allows the user to override hashedMirrors from the
# command-line. # command-line.
"NIX_HASHED_MIRRORS" "NIX_HASHED_MIRRORS"
# This variable allows overriding the timeout for connecting to
# the hashed mirrors.
"NIX_CONNECT_TIMEOUT"
] ++ (map (site: "NIX_MIRRORS_${site}") sites); ] ++ (map (site: "NIX_MIRRORS_${site}") sites);
in in