civodul pushed a commit to tag 1.8
in repository guix.
commit 138c257dcdf42f4edc22e21655e4435751b504b3
Author: Eelco Dolstra <[email protected]>
Date: Wed Oct 15 10:22:17 2014 +0200
Revert "binary download: Use $NIX_CURL_FLAGS"
This reverts commit bc4795919afac59af8f27d3c1f26ab404330f718. It
breaks the build:
http://hydra.nixos.org/build/15860847
---
scripts/download-from-binary-cache.pl.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/download-from-binary-cache.pl.in
b/scripts/download-from-binary-cache.pl.in
index 27c4895..cdce8eb 100644
--- a/scripts/download-from-binary-cache.pl.in
+++ b/scripts/download-from-binary-cache.pl.in
@@ -546,7 +546,7 @@ sub downloadBinary {
die if $requireSignedBinaryCaches && !defined $info->{signedBy};
print STDERR "\n*** Downloading ‘$url’ ", ($requireSignedBinaryCaches
? "(signed by ‘$info->{signedBy}’) " : ""), "to ‘$storePath’...\n";
checkURL $url;
- if (system("$Nix::Config::curl --fail --location --insecure
--connect-timeout $curlConnectTimeout $NIX_CURL_FLAGS '$url' $decompressor |
$Nix::Config::binDir/nix-store --restore $destPath") != 0) {
+ if (system("$Nix::Config::curl --fail --location --insecure
--connect-timeout $curlConnectTimeout '$url' $decompressor |
$Nix::Config::binDir/nix-store --restore $destPath") != 0) {
warn "download of ‘$url’ failed" . ($! ? ": $!" : "") . "\n";
next;
}