diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-12-16T23·33+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-12-16T23·33+0000 |
| commit | 194d21f9f63ceb034f3e8294f89aa6bf6a217bc9 (patch) | |
| tree | 7eb6da5955482a82f4d34b60dcb10514a4a55f59 /doc/manual/nix-copy-closure.xml | |
| parent | 3c3107da86ff71a08ce44027ee5899acf486796a (diff) | |
| parent | 273b288a7e862ac1918064537ff130cc751fa9fd (diff) | |
* Sync with the trunk.
Diffstat (limited to 'doc/manual/nix-copy-closure.xml')
| -rw-r--r-- | doc/manual/nix-copy-closure.xml | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/doc/manual/nix-copy-closure.xml b/doc/manual/nix-copy-closure.xml index 584e713f14e0..45cfc0f34245 100644 --- a/doc/manual/nix-copy-closure.xml +++ b/doc/manual/nix-copy-closure.xml @@ -24,8 +24,11 @@ </group> <arg><option>--sign</option></arg> <arg><option>--gzip</option></arg> + <arg><option>--bzip2</option></arg> + <arg><option>--xz</option></arg> + <arg><option>--include-outputs</option></arg> <arg choice='plain'> - <arg><replaceable>user@</replaceable></arg><replaceable>machine</replaceable> + <replaceable>user@</replaceable><replaceable>machine</replaceable> </arg> <arg choice='plain'><replaceable>paths</replaceable></arg> </cmdsynopsis> @@ -84,25 +87,36 @@ those paths. If this bothers you, use <listitem><para>Let the sending machine cryptographically sign the dump of each path with the key in - <filename>/nix/etc/nix/signing-key.sec</filename>. If the user on - the target machine does not have direct access to the Nix store - (i.e., if the target machine has a multi-user Nix installation), - then the target machine will check the dump against - <filename>/nix/etc/nix/signing-key.pub</filename> before unpacking - it in its Nix store. This allows secure sharing of store paths - between untrusted users on two machines, provided that there is a - trust relation between the Nix installations on both machines - (namely, they have matching public/secret keys).</para></listitem> + <filename><replaceable>sysconfdir</replaceable>/nix/signing-key.sec</filename>. + If the user on the target machine does not have direct access to + the Nix store (i.e., if the target machine has a multi-user Nix + installation), then the target machine will check the dump against + <filename><replaceable>sysconfdir</replaceable>/nix/signing-key.pub</filename> + before unpacking it in its Nix store. This allows secure sharing + of store paths between untrusted users on two machines, provided + that there is a trust relation between the Nix installations on + both machines (namely, they have matching public/secret + keys).</para></listitem> </varlistentry> - <varlistentry><term><option>--gzip</option></term> + <varlistentry><term><option>--gzip</option> / <option>--bzip2</option> / <option>--xz</option></term> - <listitem><para>Compress the dump of each path with - <command>gzip</command> before sending it.</para></listitem> + <listitem><para>Compress the dump of each path with respectively + <command>gzip</command>, <command>bzip2</command> or + <command>xz</command> before sending it. The corresponding + decompression program must be installed on the target + machine.</para></listitem> </varlistentry> + <varlistentry><term><option>--include-outputs</option></term> + + <listitem><para>Also copy the outputs of store derivations included + in the closure.</para></listitem> + + </varlistentry> + </variablelist> </refsection> |