From 9e2fc6951ca049b15149a2c4b75d2f5bff7f07e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 14:20:14 -0400 Subject: [PATCH] Disable the binary cache substituter by default for now --- doc/manual/conf-file.xml | 4 ++-- scripts/download-from-binary-cache.pl.in | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index ae167fb78..82bc025bc 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -323,8 +323,8 @@ build-use-chroot = /dev /proc /bin binary-caches A list of URLs of binary caches, separated by - whitespace. The default is - http://nixos.org/binary-cache. + whitespace. The default is empty. diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index e65e2d5b3..335d7d970 100644 --- a/scripts/download-from-binary-cache.pl.in +++ b/scripts/download-from-binary-cache.pl.in @@ -171,9 +171,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/var/nix/profiles/per-user/root/channels/binary-caches/*";