diff options
author | Ben Burdette <bburdette@gmail.com> | 2020-04-06 10:00:00 -0600 |
---|---|---|
committer | Ben Burdette <bburdette@gmail.com> | 2020-04-06 10:00:00 -0600 |
commit | 216263c36f7827a1cf578627579f9cb074dc2749 (patch) | |
tree | f9cd590c619319be2b3116f03f1f369051797fcc /doc/manual/command-ref/nix-store.xml | |
parent | 1221ae3dd07959d47d9f27e9d2271671003d2bed (diff) | |
parent | ebb20a5356af023498506324bd0f88a99175e295 (diff) |
Merge branch 'master' into error-format
Diffstat (limited to 'doc/manual/command-ref/nix-store.xml')
-rw-r--r-- | doc/manual/command-ref/nix-store.xml | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/doc/manual/command-ref/nix-store.xml b/doc/manual/command-ref/nix-store.xml index 113a3c2e4..1ddb5408d 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> @@ -1148,7 +1139,7 @@ the information that Nix considers important. For instance, timestamps are elided because all files in the Nix store have their timestamp set to 0 anyway. Likewise, all permissions are left out except for the execute bit, because all files in the Nix store have -644 or 755 permission.</para> +444 or 555 permission.</para> <para>Also, a NAR archive is <emphasis>canonical</emphasis>, meaning that “equal” paths always produce the same NAR archive. For instance, |