lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Get rid of $NIX_BINARY_CACHES

Browse source 
You can use ‘--option binary-caches URLs’ instead.
This commit is contained in:
Eelco Dolstra 2012-07-30 16:39:31 -04:00
parent ab42bf1dab
commit 9de6d10d11
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,9 @@ gc-keep-derivations = true # Idem
env-keep-derivations = false env-keep-derivations = false
</programlisting> </programlisting>
<para>You can override settings using the <option>--option</option>
flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
<para>The following settings are currently available: <para>The following settings are currently available:
<variablelist> <variablelist>
@ -310,8 +313,7 @@ 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. It can be overriden through the environment variable whitespace. The default is
<envar>NIX_BINARY_CACHES</envar>. 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

@ -166,9 +166,8 @@ sub getAvailableCaches {
$gotCaches = 1; $gotCaches = 1;
my @urls = map { s/\/+$//; $_ } split(/ /, my @urls = map { s/\/+$//; $_ } split(/ /,
($ENV{"NIX_BINARY_CACHES"} $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" : "")));
foreach my $url (@urls) { foreach my $url (@urls) {