From cc357c7e64c9568d62eed74a9f1de952aa2d8ec8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jun 2012 16:17:34 -0400
Subject: [PATCH] =?UTF-8?q?nixos-rebuild:=20Add=20a=20convenience=20option?=
 =?UTF-8?q?=20=E2=80=98--upgrade=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
---
 doc/manual/man-nixos-rebuild.xml         |  9 ++++++
 modules/installer/tools/nixos-rebuild.sh | 35 ++++++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 625e8ac7a0c..383334d82e1 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -28,6 +28,7 @@
       <arg choice='plain'><option>pull</option></arg>
     </group>
     <sbr />
+    <arg><option>--upgrade</option></arg>
     <arg><option>--install-grub</option></arg>
     <arg><option>--no-pull</option></arg>
     <arg><option>--no-build-nix</option></arg>
@@ -195,6 +196,14 @@ $ ./result/bin/run-*-vm
 
 <variablelist>
 
+  <varlistentry>
+    <term><option>--upgrade</option></term>
+    <listitem>
+      <para>Fetch the latest version of NixOS from the NixOS
+      channel.</para>
+    </listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><option>--install-grub</option></term>
     <listitem>
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index b62da16c7b7..29927f8a126 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -22,6 +22,7 @@ The operation is one of the following:
 
 Options:
 
+  --upgrade              fetch the latest version of NixOS before rebuilding
   --install-grub         (re-)install the Grub bootloader
   --pull                 do a nix-pull to get the latest NixOS channel
                          manifest
@@ -51,43 +52,47 @@ action=
 pullManifest=
 buildNix=1
 rollback=
+upgrade=
 
 while test "$#" -gt 0; do
     i="$1"; shift 1
     case "$i" in
       --help)
         showSyntax
-      ;;
+        ;;
       switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader|pull)
         action="$i"
-      ;;
+        ;;
       --install-grub)
         export NIXOS_INSTALL_GRUB=1
-      ;;
+        ;;
       --pull)
         pullManifest=1
-      ;;
+        ;;
       --no-build-nix)
         buildNix=
-      ;;
+        ;;
       --rollback)
         rollback=1
-      ;;
+        ;;
+      --upgrade)
+        upgrade=1
+        ;;
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
         extraBuildFlags="$extraBuildFlags $i"
-      ;;
+        ;;
       --max-jobs|-j|--cores|-I)
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
-      ;;
+        ;;
       --fast)
         buildNix=
         extraBuildFlags="$extraBuildFlags --show-trace"
-      ;;
+        ;;
       *)
         echo "$0: unknown option \`$i'"
         exit 1
-      ;;
+        ;;
     esac
 done
 
@@ -129,13 +134,19 @@ if [ -n "$pullManifest" -o "$action" = pull ]; then
     done
 fi
 
-if [ "$action" = pull ]; then exit 0; fi 
+if [ "$action" = pull ]; then exit 0; fi
+
+
+# If ‘--upgrade’ is given, run ‘nix-channel --update nixos’.
+if [ -n "$upgrade" ]; then
+    nix-channel --update nixos
+fi
 
 
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
-if test -n "$buildNix"; then
+if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
     if ! nix-build '<nixos>' -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
         if ! nix-build '<nixos>' -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then