aboutsummaryrefslogtreecommitdiff
path: root/doc/manual
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-05-07 15:37:28 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-05-07 15:37:28 +0200
commitea019e9a269ae35fdf8861485fe16e622f8293f6 (patch)
tree3ad5a7d15fd7c3e4f7a66d80d55e0d94c9bedc1c /doc/manual
parentcc837e24586eec62d07e0cb078e02caa6ee42171 (diff)
Add option ‘extra-binary-caches’
This allows providing additional binary caches, useful in scripts like Hydra's build reproduction scripts, in particular because untrusted caches are ignored.
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/conf-file.xml16
1 files changed, 14 insertions, 2 deletions
diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml
index 4629e8eae..932c339eb 100644
--- a/doc/manual/conf-file.xml
+++ b/doc/manual/conf-file.xml
@@ -350,13 +350,25 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
whitespace. These are not used by default, but can be enabled by
users of the Nix daemon by specifying <literal>--option
binary-caches <replaceable>urls</replaceable></literal> on the
- command line. Daemon users are only allowed to pass a subset of
- the URLs listed in <literal>binary-caches</literal> and
+ command line. Unprivileged users are only allowed to pass a
+ subset of the URLs listed in <literal>binary-caches</literal> and
<literal>trusted-binary-caches</literal>.</para></listitem>
</varlistentry>
+ <varlistentry><term><literal>extra-binary-caches</literal></term>
+
+ <listitem><para>Additional binary caches appended to those
+ specified in <option>binary-caches</option> and
+ <option>binary-caches-files</option>. When used by unprivileged
+ users, untrusted binary caches (i.e. those not listed in
+ <option>trusted-binary-caches</option>) are silently
+ ignored.</para></listitem>
+
+ </varlistentry>
+
+
<varlistentry><term><literal>binary-caches-parallel-connections</literal></term>
<listitem><para>The maximum number of parallel HTTP connections