diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-12-31 08:49:13 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-12-31 08:50:36 +0100 |
| commit | c2fca99f975c6656f7a7d1355ca098606380f2be (patch) | |
| tree | 0c8b30af0e0c5b5bda93cfe95490baa761a82617 /nixos/doc | |
| parent | f19b7b03a03b7f1d5beb44471eb9298de4b9e186 (diff) | |
Revert "Merge branch 'master' into staging-next"
This reverts commit f19b7b03a03b7f1d5beb44471eb9298de4b9e186, reversing
changes made to 572a864d024b0c91ac39133f35364362b2376c07.
Sorry. I pushed the wrong staging-next (the one that had my master
merged in). This was not intended.
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/man-nixos-rebuild.xml | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 4510fdd44225..d0ff81c1dbb3 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -113,18 +113,6 @@ <replaceable>path</replaceable> </arg> <arg> - <option>-L</option> - </arg> - <arg> - <option>--refresh</option> - </arg> - <arg> - <option>--no-net</option> - </arg> - <arg> - <option>--impure</option> - </arg> - <arg> <group choice='req'> <arg choice='plain'><option>--verbose</option></arg> <arg choice='plain'><option>-v</option></arg> @@ -143,18 +131,6 @@ <replaceable>number</replaceable> </arg> <arg> - <option>--fallback</option> - </arg> - <arg> - <option>--repair</option> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--no-build-output</option></arg> - <arg choice='plain'><option>-Q</option></arg> - </group> - </arg> - <arg> <group choice='req'> <arg choice='plain'><option>--keep-failed</option></arg> <arg choice='plain'><option>-K</option></arg> @@ -591,19 +567,10 @@ <para> In addition, <command>nixos-rebuild</command> accepts various Nix-related - flags: <option>-I</option>, <option>--max-jobs</option> / <option>-j</option>, + flags, including <option>--max-jobs</option> / <option>-j</option>, <option>--show-trace</option>, <option>--keep-failed</option>, - <option>--keep-going</option>, <option>--impure</option>, and <option>--verbose</option> / - <option>--builders</option>, <option>--show-trace</option>, - <option>--fallback</option>, <option>--repair</option>, - <option>--no-build-output</option> / <option>-Q</option>, - <option>--keep-failed</option> / <option>-K</option>, - <option>--keep-going</option> / <option>-k</option> and <option>--verbose</option> / + <option>--keep-going</option>, <option>--impure</option>, and <option>--verbose</option> / <option>-v</option>. See the Nix manual for details. - - The following Nix flags that are support by the upcoming nix 2.4 version: - <option>-L</option>, <option>--refresh</option>, <option>--no-net</option>, - <option>--no-net</option>, <option>--impure</option>. See <command>nix --help</command> or <command>nix build --help</command> for details. </para> </refsection> |