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

Update the default binary cache URL to cache.nixos.org

Browse source
This commit is contained in:
Eelco Dolstra 2013-06-05 13:36:43 +02:00
parent ff08306746
commit f0576d6775
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -325,7 +325,7 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
<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
<literal>http://nixos.org/binary-cache</literal>.</para></listitem> <literal>http://cache.nixos.org</literal>.</para></listitem>
</varlistentry> </varlistentry>

8
doc/manual/nix-push.xml
View file

@ -252,7 +252,7 @@ The properties that are currently supported are:
<listitem><para>Each binary cache has a priority (defaulting to <listitem><para>Each binary cache has a priority (defaulting to
50). Binary caches are checked for binaries in order of ascending 50). Binary caches are checked for binaries in order of ascending
priority; thus a higher number denotes a lower priority. The priority; thus a higher number denotes a lower priority. The
binary cache <uri>http://nixos.org/binary-cache</uri> has priority binary cache <uri>http://cache.nixos.org</uri> has priority
40.</para></listitem> 40.</para></listitem>
</varlistentry> </varlistentry>
@ -270,14 +270,14 @@ URL <replaceable>url</replaceable> has a binary for
<replaceable>p</replaceable>, Nix fetches <replaceable>p</replaceable>, Nix fetches
<replaceable>url/h</replaceable>, where <replaceable>h</replaceable> <replaceable>url/h</replaceable>, where <replaceable>h</replaceable>
is the hash part of <replaceable>p</replaceable>. Thus, if we have a is the hash part of <replaceable>p</replaceable>. Thus, if we have a
cache <uri>http://nixos.org/binary-cache</uri> and we want to obtain cache <uri>http://cache.nixos.org</uri> and we want to obtain
the store path the store path
<screen> <screen>
/nix/store/a8922c0h87iilxzzvwn2hmv8x210aqb9-glibc-2.7 /nix/store/a8922c0h87iilxzzvwn2hmv8x210aqb9-glibc-2.7
</screen> </screen>
then Nix will attempt to fetch then Nix will attempt to fetch
<screen> <screen>
http://nixos.org/binary-cache/a8922c0h87iilxzzvwn2hmv8x210aqb9.narinfo http://cache.nixos.org/a8922c0h87iilxzzvwn2hmv8x210aqb9.narinfo
</screen> </screen>
(Commands such as <command>nix-env -qas</command> will issue an HTTP (Commands such as <command>nix-env -qas</command> will issue an HTTP
HEAD request, since it only needs to know if the HEAD request, since it only needs to know if the
@ -381,7 +381,7 @@ The fields are as follows:
references exist (e.g., references exist (e.g.,
<filename>/nix/store/2ma2k0ys8knh4an48n28vigcmc2z8773-linux-headers-2.6.23.16</filename>), <filename>/nix/store/2ma2k0ys8knh4an48n28vigcmc2z8773-linux-headers-2.6.23.16</filename>),
Nix will fetch <screen> Nix will fetch <screen>
http://nixos.org/binary-cache/nar/0zzjpdz46mdn74v09m053yczlz4am038g8r74iy8w43gx8801h70.nar.bz2 http://cache.nixos.org/nar/0zzjpdz46mdn74v09m053yczlz4am038g8r74iy8w43gx8801h70.nar.bz2
</screen> and decompress and unpack it to </screen> and decompress and unpack it to
<filename>/nix/store/a8922c0h87iilxzzvwn2hmv8x210aqb9-glibc-2.7</filename>.</para> <filename>/nix/store/a8922c0h87iilxzzvwn2hmv8x210aqb9-glibc-2.7</filename>.</para>

6
doc/manual/release-notes.xml
View file

@ -107,10 +107,10 @@ Pernsteiner.</para>
configuration setting <option>binary-caches</option> contains a configuration setting <option>binary-caches</option> contains a
list of URLs of binary caches. For instance, doing list of URLs of binary caches. For instance, doing
<screen> <screen>
$ nix-env -i thunderbird --option binary-caches http://nixos.org/binary-cache $ nix-env -i thunderbird --option binary-caches http://cache.nixos.org
</screen> </screen>
will install Thunderbird and its dependencies, using the available will install Thunderbird and its dependencies, using the available
pre-built binaries in <uri>http://nixos.org/binary-cache</uri>. pre-built binaries in <uri>http://cache.nixos.org</uri>.
The main advantage over the old “manifest”-based method of getting The main advantage over the old “manifest”-based method of getting
pre-built binaries is that you don’t have to worry about your pre-built binaries is that you don’t have to worry about your
manifest being in sync with the Nix expressions you’re installing manifest being in sync with the Nix expressions you’re installing
@ -123,7 +123,7 @@ $ nix-env -i thunderbird --option binary-caches http://nixos.org/binary-cache
used automatically if you subscribe to that channel. If you use used automatically if you subscribe to that channel. If you use
the Nixpkgs or NixOS channels the Nixpkgs or NixOS channels
(<uri>http://nixos.org/channels</uri>) you automatically get the (<uri>http://nixos.org/channels</uri>) you automatically get the
cache <uri>http://nixos.org/binary-cache</uri>.</para> cache <uri>http://cache.nixos.org</uri>.</para>
<para>Binary caches are created using <command>nix-push</command>. <para>Binary caches are created using <command>nix-push</command>.
For details on the operation and format of binary caches, see the For details on the operation and format of binary caches, see the

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

@ -196,7 +196,7 @@ sub getAvailableCaches {
} }
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://cache.nixos.org" : ""));
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/*";