diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T18·20-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T18·20-0400 |
| commit | 9e2fc6951ca049b15149a2c4b75d2f5bff7f07e1 (patch) | |
| tree | 49c0c914a6d3d02f54150bfaba3731aa9b98d720 | |
| parent | cfd968dd94f35c5ef781be9bda883d8818fc1d6e (diff) | |
Disable the binary cache substituter by default for now
| -rw-r--r-- | doc/manual/conf-file.xml | 4 | ||||
| -rw-r--r-- | 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 ae167fb787c7..82bc025bcd74 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -323,8 +323,8 @@ build-use-chroot = /dev /proc /bin</programlisting> <varlistentry><term><literal>binary-caches</literal></term> <listitem><para>A list of URLs of binary caches, separated by - whitespace. The default is - <literal>http://nixos.org/binary-cache</literal>.</para></listitem> + whitespace. The default is empty.<!-- The default is + <literal>http://nixos.org/binary-cache</literal>. --></para></listitem> </varlistentry> diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index e65e2d5b36d2..335d7d9706fd 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/*"; |