Disallow concurrent auto-upgrade runs

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

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index b493ac00d0db5478fe782ce065a934962779bb47..2326eccfd7c1c52bcac2e9a539fa7db0953fd160 100644 (file)
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -40,7 +40,24 @@ in {
     nixpkgs.overlays = [
       (import ../overlays/keyedgit.nix)
       (import ../overlays/pinch.nix)
     nixpkgs.overlays = [
       (import ../overlays/keyedgit.nix)
       (import ../overlays/pinch.nix)

+      (self: super: {
+        auto-upgrade = super.writeShellScriptBin "auto-upgrade" ''
+          flock /run/auto-upgrade-with-pinch ${super.writeShellScript "auto-upgrade-with-lock-held" ''
+            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;


@@ -58,7 +75,6 @@ in {
         gitMinimal
         gnutar
         gzip
         gitMinimal
         gnutar
         gzip

-        pinch

         xz.bin
       ];
 
         xz.bin
       ];
 


@@ -70,13 +86,7 @@ in {
         # intervene either to fix the problem or disable automatic updates.
         sleep 2h
 
         # intervene either to fix the problem or disable automatic updates.
         sleep 2h
 

-        (
-          cd /etc/nixos
-          ${pkgs.keyedgit cfg.key}/bin/git pull --ff-only --verify-signatures
-          pinch update channels
-        )
-
-        ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch --no-build-output
+        ${pkgs.auto-upgrade}/bin/auto-upgrade

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