lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Disable the binary cache substituter by default for now

Browse source
This commit is contained in:
Eelco Dolstra 2012-08-27 14:20:14 -04:00
parent cfd968dd94
commit 9e2fc6951c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/manual/conf-file.xml
View file

@ -323,8 +323,8 @@ build-use-chroot = /dev /proc /bin</programlisting>
<varlistentry><term><literal>binary-caches</literal></term> <varlistentry><term><literal>binary-caches</literal></term>
<listitem><para>A list of URLs of binary caches, separated by <listitem><para>A list of URLs of binary caches, separated by
whitespace. The default is whitespace. The default is empty.<!-- The default is
<literal>http://nixos.org/binary-cache</literal>.</para></listitem> <literal>http://nixos.org/binary-cache</literal>. --></para></listitem>
</varlistentry> </varlistentry>

5
scripts/download-from-binary-cache.pl.in
View file

@ -171,9 +171,8 @@ sub getAvailableCaches {
return map { s/\/+$//; $_ } split(/ /, $s); return map { s/\/+$//; $_ } split(/ /, $s);
} }
my @urls = strToList my @urls = strToList ($Nix::Config::config{"binary-caches"} // "");
($Nix::Config::config{"binary-caches"} # // ($Nix::Config::storeDir eq "/nix/store" ? "http://nixos.org/binary-cache" : ""));
// ($Nix::Config::storeDir eq "/nix/store" ? "http://nixos.org/binary-cache" : ""));
my $urlsFiles = $Nix::Config::config{"binary-cache-files"} my $urlsFiles = $Nix::Config::config{"binary-cache-files"}
// "/nix/var/nix/profiles/per-user/root/channels/binary-caches/*"; // "/nix/var/nix/profiles/per-user/root/channels/binary-caches/*";