puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix.conf man page: binary-caches -> substituters

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-20 13:39:01 +02:00
parent 76cb3c702c
commit 4222402219
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -334,15 +334,16 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
</varlistentry>
<varlistentry><term><literal>binary-caches</literal></term>
<varlistentry><term><literal>substituters</literal></term>
<listitem><para>A list of URLs of binary caches, separated by
<listitem><para>A list of URLs of substituters, separated by
whitespace. The default is
<literal>https://cache.nixos.org</literal>.</para></listitem>
</varlistentry>
<!--
<varlistentry><term><literal>binary-caches-files</literal></term>
<listitem><para>A list of names of files that will be read to
@ -355,28 +356,28 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
option to read files created by untrusted users!</para></listitem>
</varlistentry>
-->
<varlistentry><term><literal>trusted-binary-caches</literal></term>
<varlistentry><term><literal>trusted-substituters</literal></term>
<listitem><para>A list of URLs of binary caches, separated by
<listitem><para>A list of URLs of substituters, separated by
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
substituters <replaceable>urls</replaceable></literal> on the
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>
subset of the URLs listed in <literal>substituters</literal> and
<literal>trusted-substituters</literal>.</para></listitem>
</varlistentry>
<varlistentry><term><literal>extra-binary-caches</literal></term>
<varlistentry><term><literal>extra-substituters</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
specified in <option>substituters</option>. When used by
unprivileged users, untrusted substituters (i.e. those not listed
in <option>trusted-substituters</option>) are silently
ignored.</para></listitem>
</varlistentry>
@ -412,15 +413,6 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
</varlistentry>
<varlistentry><term><literal>verify-https-binary-caches</literal></term>
<listitem><para>Whether HTTPS binary caches are required to have a
certificate that can be verified. Defaults to
<literal>true</literal>.</para></listitem>
</varlistentry>
<varlistentry><term><literal>netrc-file</literal></term>
<listitem><para>If set to an absolute path to a <filename>netrc</filename>