summary refs log tree commit diff
diff options
context:
space:
mode:
authorhyperfekt <git@hyperfekt.net>2020-10-14 20:45:22 +0000
committerhyperfekt <git@hyperfekt.net>2020-10-31 17:13:45 +0100
commit1338647a8c9e6ad2459f90b3c462d497544e96be (patch)
tree44a9e19d272a62513640bf1574125e5b7165a194
parent76165535700f917ecb057092e0bbe0e1391ad2a3 (diff)
downloadnixpkgs-1338647a8c9e6ad2459f90b3c462d497544e96be.tar
nixpkgs-1338647a8c9e6ad2459f90b3c462d497544e96be.tar.gz
nixpkgs-1338647a8c9e6ad2459f90b3c462d497544e96be.tar.bz2
nixpkgs-1338647a8c9e6ad2459f90b3c462d497544e96be.tar.lz
nixpkgs-1338647a8c9e6ad2459f90b3c462d497544e96be.tar.xz
nixpkgs-1338647a8c9e6ad2459f90b3c462d497544e96be.tar.zst
nixpkgs-1338647a8c9e6ad2459f90b3c462d497544e96be.zip
nixos-install: pass through keep-going flag
-rw-r--r--nixos/doc/manual/man-nixos-install.xml17
-rw-r--r--nixos/modules/installer/tools/nixos-install.sh2
2 files changed, 18 insertions, 1 deletions
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 12d01597199..91542d37cbd 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -108,6 +108,12 @@
 
    <arg>
     <arg choice='plain'>
+     <option>--keep-going</option>
+    </arg>
+   </arg>
+
+   <arg>
+    <arg choice='plain'>
      <option>--help</option>
     </arg>
    </arg>
@@ -303,6 +309,17 @@
    </varlistentry>
    <varlistentry>
     <term>
+     <option>--keep-going</option>
+    </term>
+    <listitem>
+     <para>
+      Causes Nix to continue building derivations as far as possible
+      in the face of failed builds.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
      <option>--help</option>
     </term>
     <listitem>
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 9279f11b4f3..9d49d4055e4 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -64,7 +64,7 @@ while [ "$#" -gt 0 ]; do
         --no-bootloader)
             noBootLoader=1
             ;;
-        --show-trace|--impure)
+        --show-trace|--impure|--keep-going)
             extraBuildFlags+=("$i")
             ;;
         --help)