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

Use https://cache.nixos.org instead of http://cache.nixos.org

Browse source
This commit is contained in:
Eelco Dolstra 2014-12-09 11:50:46 +01:00
parent 9c58691ce3
commit e5891f2ea8
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -348,7 +348,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://cache.nixos.org</literal>.</para></listitem> <literal>https://cache.nixos.org</literal>.</para></listitem>
</varlistentry> </varlistentry>

10
doc/manual/command-ref/nix-push.xml
View file

@ -260,7 +260,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://cache.nixos.org</uri> has priority binary cache <uri>https://cache.nixos.org</uri> has priority
40.</para></listitem> 40.</para></listitem>
</varlistentry> </varlistentry>
@ -278,14 +278,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://cache.nixos.org</uri> and we want to obtain cache <uri>https://cache.nixos.org</uri> and we want to obtain the
the store path 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://cache.nixos.org/a8922c0h87iilxzzvwn2hmv8x210aqb9.narinfo https://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
@ -389,7 +389,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://cache.nixos.org/nar/0zzjpdz46mdn74v09m053yczlz4am038g8r74iy8w43gx8801h70.nar.bz2 https://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>

4
doc/manual/introduction/about-nix.xml
View file

@ -166,8 +166,8 @@ cache</emphasis>, a web server that provides pre-built binaries. For
instance, when asked to build instance, when asked to build
<literal>/nix/store/b6gvzjyb2pg0…-firefox-33.1</literal> from source, <literal>/nix/store/b6gvzjyb2pg0…-firefox-33.1</literal> from source,
Nix would first check if the file Nix would first check if the file
<uri>http://cache.nixos.org/b6gvzjyb2pg0….narinfo</uri> exists, and if <uri>https://cache.nixos.org/b6gvzjyb2pg0….narinfo</uri> exists, and
so, fetch the pre-built binary referenced from there; otherwise, it if so, fetch the pre-built binary referenced from there; otherwise, it
would fall back to building from source.</para> would fall back to building from source.</para>
</simplesect> </simplesect>

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

@ -4,7 +4,7 @@
version="5.0" version="5.0"
xml:id="ssec-relnotes-1.8"> xml:id="ssec-relnotes-1.8">
<title>Release 1.8 (TBA)</title> <title>Release 1.8 (December 9, 2014)</title>
<itemizedlist> <itemizedlist>
@ -13,6 +13,10 @@
--serve</command> on the remote machine. This requires build slaves --serve</command> on the remote machine. This requires build slaves
to be updated to Nix 1.8.</para></listitem> to be updated to Nix 1.8.</para></listitem>
<listitem><para>Nix now uses HTTPS instead of HTTP to access the
default binary cache,
<literal>cache.nixos.org</literal>.</para></listitem>
<listitem><para><command>nix-env</command> selectors are now regular <listitem><para><command>nix-env</command> selectors are now regular
expressions. For instance, you can do expressions. For instance, you can do

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

@ -218,7 +218,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://cache.nixos.org" : "")); ($Nix::Config::storeDir eq "/nix/store" ? "https://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/*";