From aebea2e489a21af260e7a654b0313efe042fbf9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Jan 2013 22:16:37 +0100 Subject: [PATCH] Reinstate the http://nixos.org/binary-cache default for the binary-caches setting --- doc/manual/conf-file.xml | 4 ++-- scripts/download-from-binary-cache.pl.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 588e15216..4629e8eae 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -324,8 +324,8 @@ flag, e.g. --option gc-keep-outputs false. binary-caches A list of URLs of binary caches, separated by - whitespace. The default is empty. + whitespace. The default is + http://nixos.org/binary-cache. diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index 98333dafb..03c331a63 100644 --- a/scripts/download-from-binary-cache.pl.in +++ b/scripts/download-from-binary-cache.pl.in @@ -193,8 +193,8 @@ sub getAvailableCaches { return map { s/\/+$//; $_ } split(/ /, $s); } - my @urls = strToList ($Nix::Config::config{"binary-caches"} // ""); - # // ($Nix::Config::storeDir eq "/nix/store" ? "http://nixos.org/binary-cache" : "")); + my @urls = strToList($Nix::Config::config{"binary-caches"} // + ($Nix::Config::storeDir eq "/nix/store" ? "http://nixos.org/binary-cache" : "")); my $urlsFiles = $Nix::Config::config{"binary-cache-files"} // "$Nix::Config::stateDir/profiles/per-user/$userName/channels/binary-caches/*";