From f0576d67756fedca0010d20aaed2e9cffd24a108 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Jun 2013 13:36:43 +0200 Subject: [PATCH] Update the default binary cache URL to cache.nixos.org --- doc/manual/conf-file.xml | 2 +- doc/manual/nix-push.xml | 8 ++++---- doc/manual/release-notes.xml | 6 +++--- scripts/download-from-binary-cache.pl.in | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 932c339eb..fa9149834 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -325,7 +325,7 @@ flag, e.g. --option gc-keep-outputs false. A list of URLs of binary caches, separated by whitespace. The default is - http://nixos.org/binary-cache. + http://cache.nixos.org. diff --git a/doc/manual/nix-push.xml b/doc/manual/nix-push.xml index 4512970d9..c4a6b8080 100644 --- a/doc/manual/nix-push.xml +++ b/doc/manual/nix-push.xml @@ -252,7 +252,7 @@ The properties that are currently supported are: Each binary cache has a priority (defaulting to 50). Binary caches are checked for binaries in order of ascending priority; thus a higher number denotes a lower priority. The - binary cache http://nixos.org/binary-cache has priority + binary cache http://cache.nixos.org has priority 40. @@ -270,14 +270,14 @@ URL url has a binary for p, Nix fetches url/h, where h is the hash part of p. Thus, if we have a -cache http://nixos.org/binary-cache and we want to obtain +cache http://cache.nixos.org and we want to obtain the store path /nix/store/a8922c0h87iilxzzvwn2hmv8x210aqb9-glibc-2.7 then Nix will attempt to fetch -http://nixos.org/binary-cache/a8922c0h87iilxzzvwn2hmv8x210aqb9.narinfo +http://cache.nixos.org/a8922c0h87iilxzzvwn2hmv8x210aqb9.narinfo (Commands such as nix-env -qas will issue an HTTP HEAD request, since it only needs to know if the @@ -381,7 +381,7 @@ The fields are as follows: references exist (e.g., /nix/store/2ma2k0ys8knh4an48n28vigcmc2z8773-linux-headers-2.6.23.16), Nix will fetch -http://nixos.org/binary-cache/nar/0zzjpdz46mdn74v09m053yczlz4am038g8r74iy8w43gx8801h70.nar.bz2 +http://cache.nixos.org/nar/0zzjpdz46mdn74v09m053yczlz4am038g8r74iy8w43gx8801h70.nar.bz2 and decompress and unpack it to /nix/store/a8922c0h87iilxzzvwn2hmv8x210aqb9-glibc-2.7. diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index 5ab5041aa..f58e549ef 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -107,10 +107,10 @@ Pernsteiner. configuration setting contains a list of URLs of binary caches. For instance, doing -$ nix-env -i thunderbird --option binary-caches http://nixos.org/binary-cache +$ nix-env -i thunderbird --option binary-caches http://cache.nixos.org will install Thunderbird and its dependencies, using the available - pre-built binaries in http://nixos.org/binary-cache. + pre-built binaries in http://cache.nixos.org. The main advantage over the old “manifest”-based method of getting pre-built binaries is that you don’t have to worry about your 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 the Nixpkgs or NixOS channels (http://nixos.org/channels) you automatically get the - cache http://nixos.org/binary-cache. + cache http://cache.nixos.org. Binary caches are created using nix-push. For details on the operation and format of binary caches, see the diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index 1b4215278..a47d3579e 100644 --- a/scripts/download-from-binary-cache.pl.in +++ b/scripts/download-from-binary-cache.pl.in @@ -196,7 +196,7 @@ sub getAvailableCaches { } 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"} // "$Nix::Config::stateDir/profiles/per-user/$userName/channels/binary-caches/*";