Make 'auto-upgrade' available in path

[auto-upgrade-with-pinch] / modules / auto-upgrade.nix

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index 973ac2268aff6e9b2b108d24eb5582984a79adb2..974ebb7a9d96a091e0157428aa6d817b9bfa0949 100644 (file)
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -25,11 +25,37 @@ in {
           which the update will occur.
         '';
       };
           which the update will occur.
         '';
       };

+
+      key = mkOption {
+        type = types.path;
+        description = ''
+          GPG key that signs updates.  Updates are only merged if the commit
+          at the tip of the remote branch is signed with this key.
+        '';
+      };

     };
   };
 
   config = lib.mkIf cfg.enable {
     };
   };
 
   config = lib.mkIf cfg.enable {

-    nixpkgs.overlays = [ (import ../overlays/pinch.nix) ];
+    nixpkgs.overlays = [
+      (import ../overlays/keyedgit.nix)
+      (import ../overlays/pinch.nix)
+      (self: super: {
+        auto-upgrade = super.writeShellScriptBin "auto-upgrade" ''
+        set -e
+        (
+          cd /etc/nixos
+          ${self.keyedgit cfg.key}/bin/git pull --ff-only --verify-signatures
+          ${self.pinch}/bin/pinch update channels
+        )
+
+        ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch --no-build-output
+        '';
+      })
+    ];
+
+    environment.systemPackages = [ pkgs.auto-upgrade ];
+

     systemd.services.nixos-upgrade = {
       description = "NixOS Upgrade";
       restartIfChanged = false;
     systemd.services.nixos-upgrade = {
       description = "NixOS Upgrade";
       restartIfChanged = false;


@@ -47,19 +73,18 @@ in {
         gitMinimal
         gnutar
         gzip
         gitMinimal
         gnutar
         gzip

-        pinch

         xz.bin
       ];
 
       script = ''
         set -e
         xz.bin
       ];
 
       script = ''
         set -e

-        (
-          cd /etc/nixos
-          git pull --ff-only
-          pinch update channels
-        )

 
 

-        ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch --no-build-output
+        # Chill for awhile before applying updates.  If applying an update
+        # badly breaks things, we want a window in which an operator can
+        # intervene either to fix the problem or disable automatic updates.
+        sleep 2h
+
+        ${pkgs.auto-upgrade}/bin/auto-upgrade

       '';
 
       startAt = cfg.dates;
       '';
 
       startAt = cfg.dates;