[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
255/376: binary download: Use $NIX_CURL_FLAGS
From: |
Ludovic Courtès |
Subject: |
255/376: binary download: Use $NIX_CURL_FLAGS |
Date: |
Wed, 28 Jan 2015 22:05:26 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit bc4795919afac59af8f27d3c1f26ab404330f718
Author: wmertens <address@hidden>
Date: Tue Oct 14 15:36:14 2014 +0200
binary download: Use $NIX_CURL_FLAGS
As in
https://github.com/NixOS/nixpkgs/blob/5c0816567d6b99bd2ef7c8ae5744f80a6a0372c4/pkgs/build-support/fetchurl/builder.sh#L17
---
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 cdce8eb..27c4895 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 '$url' $decompressor |
$Nix::Config::binDir/nix-store --restore $destPath") != 0) {
+ if (system("$Nix::Config::curl --fail --location --insecure
--connect-timeout $curlConnectTimeout $NIX_CURL_FLAGS '$url' $decompressor |
$Nix::Config::binDir/nix-store --restore $destPath") != 0) {
warn "download of ‘$url’ failed" . ($! ? ": $!" : "") . "\n";
next;
}
- 364/376: ReiserFS -> ext4, (continued)
- 364/376: ReiserFS -> ext4, Ludovic Courtès, 2015/01/28
- 375/376: Add a section on nix-serve, Ludovic Courtès, 2015/01/28
- 361/376: Document channel format and excise most mentions of manifests and nix-pull, Ludovic Courtès, 2015/01/28
- 370/376: Delete the stdenv section, Ludovic Courtès, 2015/01/28
- 374/376: Add section on SSH substituter, Ludovic Courtès, 2015/01/28
- 373/376: Pedantry, Ludovic Courtès, 2015/01/28
- 368/376: Fix build, Ludovic Courtès, 2015/01/28
- 369/376: Bla, Ludovic Courtès, 2015/01/28
- 294/376: Clean up temp roots in a more C++ way, Ludovic Courtès, 2015/01/28
- 287/376: Don't use ADDR_LIMIT_3GB, Ludovic Courtès, 2015/01/28
- 255/376: binary download: Use $NIX_CURL_FLAGS,
Ludovic Courtès <=
- 301/376: 'build-cache-failures' -> 'build-cache-failure' in nix.conf documentation., Ludovic Courtès, 2015/01/28
- 275/376: Revert "Revert "Revert "Temporarily disable darwin builds while hydra's darwin is borked""", Ludovic Courtès, 2015/01/28
- 302/376: Don't claim FreeBSD support, Ludovic Courtès, 2015/01/28
- 274/376: Don't pull in git when doing a nix-shell, Ludovic Courtès, 2015/01/28
- 247/376: mkList: Scrub better, Ludovic Courtès, 2015/01/28
- 248/376: Improved error message when encountering unsupported file types, Ludovic Courtès, 2015/01/28
- 295/376: nix-daemon: Call exit(), not _exit(), Ludovic Courtès, 2015/01/28
- 242/376: Add primop ‘attrValues’, Ludovic Courtès, 2015/01/28
- 254/376: nix-store -q: Check for conflicting flags, Ludovic Courtès, 2015/01/28
- 265/376: Merge pull request #380 from shlevy/temp-disable-darwin, Ludovic Courtès, 2015/01/28