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

Reinstate the http://nixos.org/binary-cache default for the binary-caches setting

Browse source
This commit is contained in:
Eelco Dolstra 2013-01-02 22:16:37 +01:00
parent 649bb60617
commit aebea2e489
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -324,8 +324,8 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
<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 empty.<!-- The default is whitespace. The default is
<literal>http://nixos.org/binary-cache</literal>. --></para></listitem> <literal>http://nixos.org/binary-cache</literal>.</para></listitem>
</varlistentry> </varlistentry>

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

@ -193,8 +193,8 @@ sub getAvailableCaches {
return map { s/\/+$//; $_ } split(/ /, $s); return map { s/\/+$//; $_ } split(/ /, $s);
} }
my @urls = strToList ($Nix::Config::config{"binary-caches"} // ""); my @urls = strToList($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::Config::stateDir/profiles/per-user/$userName/channels/binary-caches/*"; // "$Nix::Config::stateDir/profiles/per-user/$userName/channels/binary-caches/*";