From 4222402219ca3a356d23e05e0474f8648b111d91 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Apr 2017 13:39:01 +0200 Subject: nix.conf man page: binary-caches -> substituters --- doc/manual/command-ref/conf-file.xml | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'doc/manual/command-ref') diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index 3de9647aa4eb..73e0017ccef0 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -334,15 +334,16 @@ flag, e.g. --option gc-keep-outputs false. - binary-caches + substituters - A list of URLs of binary caches, separated by + A list of URLs of substituters, separated by whitespace. The default is https://cache.nixos.org. + - trusted-binary-caches + trusted-substituters - A list of URLs of binary caches, separated by + 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 --option - binary-caches urls on the + substituters urls on the command line. Unprivileged users are only allowed to pass a - subset of the URLs listed in binary-caches and - trusted-binary-caches. + subset of the URLs listed in substituters and + trusted-substituters. - extra-binary-caches + extra-substituters Additional binary caches appended to those - specified in and - . When used by unprivileged - users, untrusted binary caches (i.e. those not listed in - ) are silently + specified in . When used by + unprivileged users, untrusted substituters (i.e. those not listed + in ) are silently ignored. @@ -412,15 +413,6 @@ flag, e.g. --option gc-keep-outputs false. - verify-https-binary-caches - - Whether HTTPS binary caches are required to have a - certificate that can be verified. Defaults to - true. - - - - netrc-file If set to an absolute path to a netrc -- cgit 1.4.1