Separate fetch and update steps

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

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index e52720d8af0d1777da12f50be1148786c39d2052..aabb0e2dcc4c6a530e9f9b40b2f456a797bb4143 100644 (file)
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -25,14 +25,16 @@ let
           }
         }
 
-        # Update channels
+        # Fetch updates
         (
           cd /etc/nixos
           ${pkgs.git}/bin/git fetch
           PATH="${pkgs.keyedgit cfg.keys}/bin:$PATH" ${pkgs.polite-merge}/bin/polite-merge --ff-only --verify-signatures
-          ${pkgs.pinch}/bin/pinch update channels
         )
 
+        # Update channels
+        ${pkgs.pinch}/bin/pinch update /etc/nixos/channels
+
         # Build
         in_tmpdir ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build
         as_user nix-build --no-out-link '<nixpkgs>' -A ${