diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/conf-file.xml | 20 | ||||
| -rw-r--r-- | doc/manual/release-notes.xml | 5 |
2 files changed, 25 insertions, 0 deletions
diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 7fd104eb4ac8..00016b97b45a 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -297,6 +297,26 @@ build-use-chroot = /dev /proc /bin</programlisting> </varlistentry> + <varlistentry><term><literal>binary-caches</literal></term> + + <listitem><para>A list of URLs of binary caches, separated by + whitespace. It can be overriden through the environment variable + <envar>NIX_BINARY_CACHES</envar>. The default is + <literal>http://nixos.org/binary-cache</literal>.</para></listitem> + + </varlistentry> + + + <varlistentry><term><literal>binary-caches-parallel-connections</literal></term> + + <listitem><para>The maximum number of parallel HTTP connections + used by the binary cache substituter to get NAR info files. This + number should be high to minimise latency. It defaults to + 150.</para></listitem> + + </varlistentry> + + <varlistentry><term><literal>system</literal></term> <listitem><para>This option specifies the canonical Nix system diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index 66ced1c9c429..9a5449def23e 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -35,6 +35,11 @@ <literal>false</literal>.</para> </listitem> + <listitem> + <para>When using the Nix daemon, the <option>-s</option> flag in + <command>nix-env -qa</command> is now much faster.</para> + </listitem> + </itemizedlist> </section> |