From: Scott Worley <scottworley@scottworley.com>
Date: Sat, 30 May 2020 18:29:51 +0000 (-0700)
Subject: Separate fetch and update steps
X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/commitdiff_plain/fae44c38c483a1ab6928c28b3c58e45034582a4b?ds=sidebyside;hp=318cb8e22fa7dcdf691149b520b5d24428ee3cc9

Separate fetch and update steps
---

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index e52720d..aabb0e2 100644
--- 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 ${