diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-21T15·22+0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-21T15·24+0100 |
commit | 0d54671b7b3aa96ab45347e65352979d874346ea (patch) | |
tree | f0f56c1c5461128527b86330dc3c5a3f07689dcf /doc/manual/command-ref/conf-file.xml | |
parent | e2d71bd1862cdda65f957c6a6c41016258d9e003 (diff) |
Manual: Update chapter on remote builds
Alos add a command "nix ping-store" to make it easier to see if Nix can connect to a remote builder (e.g. 'nix ping-store --store ssh://mac').
Diffstat (limited to 'doc/manual/command-ref/conf-file.xml')
-rw-r--r-- | doc/manual/command-ref/conf-file.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index c14a4d206b8d..f658058994c0 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -763,7 +763,7 @@ builtins.fetchurl { more details. </para> <para> - Since these files are loaded into the same address space as + Since these files are loaded into the same address space as Nix itself, they must be DSOs compatible with the instance of Nix running at the time (i.e. compiled against the same headers, not linked to any incompatible libraries). They @@ -771,14 +771,23 @@ builtins.fetchurl { be available already at load time. </para> <para> - If an entry in the list is a directory, all files in the - directory are loaded as plugins (non-recursively). + If an entry in the list is a directory, all files in the + directory are loaded as plugins (non-recursively). </para> </listitem> </varlistentry> + <varlistentry xml:id="conf-builders"> + <term><literal>builders</literal></term> + <listitem> + <para>A list of machines on which to perform builds. <phrase + condition="manual">See <xref linkend="chap-distributed-builds" + /> for details.</phrase></para> + </listitem> + </varlistentry> + </variablelist> </para> |