diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-03-20 13:15:11 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-03-20 13:15:11 +0100 |
| commit | 1537e270fbb9a5a29e7773824062023e3ef5da5a (patch) | |
| tree | 3472dd00383294975db10c09d1abf35acc844f65 /doc | |
| parent | 1e6e673eb789b7588e159526947545ccc8a2da75 (diff) | |
| parent | 4ef43198f341499189f1f9e7e9069224cb4d19ac (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/command-ref/nix-env.xml | 3 | ||||
| -rw-r--r-- | doc/manual/command-ref/nix-store.xml | 17 |
2 files changed, 6 insertions, 14 deletions
diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml index d257a5e49..9c03ccce1 100644 --- a/doc/manual/command-ref/nix-env.xml +++ b/doc/manual/command-ref/nix-env.xml @@ -1066,7 +1066,8 @@ user environment elements, etc. --> the derivation, which can be used to unambiguously select it using the <link linkend="opt-attr"><option>--attr</option> option</link> available in commands that install derivations like - <literal>nix-env --install</literal>.</para></listitem> + <literal>nix-env --install</literal>. This option only works + together with <option>--available</option></para></listitem> </varlistentry> diff --git a/doc/manual/command-ref/nix-store.xml b/doc/manual/command-ref/nix-store.xml index 113a3c2e4..e8bbd16e8 100644 --- a/doc/manual/command-ref/nix-store.xml +++ b/doc/manual/command-ref/nix-store.xml @@ -360,7 +360,6 @@ EOF <arg choice='plain'><option>--print-roots</option></arg> <arg choice='plain'><option>--print-live</option></arg> <arg choice='plain'><option>--print-dead</option></arg> - <arg choice='plain'><option>--delete</option></arg> </group> <arg><option>--max-freed</option> <replaceable>bytes</replaceable></arg> </cmdsynopsis> @@ -407,14 +406,6 @@ the Nix store not reachable via file system references from a set of </varlistentry> - <varlistentry><term><option>--delete</option></term> - - <listitem><para>This operation performs an actual garbage - collection. All dead paths are removed from the - store. This is the default.</para></listitem> - - </varlistentry> - </variablelist> <para>By default, all unreachable paths are deleted. The following @@ -444,10 +435,10 @@ and <link linkend="conf-keep-derivations"><literal>keep-derivations</literal></link> variables in the Nix configuration file.</para> -<para>With <option>--delete</option>, the collector prints the total -number of freed bytes when it finishes (or when it is interrupted). -With <option>--print-dead</option>, it prints the number of bytes that -would be freed.</para> +<para>By default, the collector prints the total number of freed bytes +when it finishes (or when it is interrupted). With +<option>--print-dead</option>, it prints the number of bytes that would +be freed.</para> </refsection> |