From fae44c38c483a1ab6928c28b3c58e45034582a4b Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sat, 30 May 2020 11:29:51 -0700 Subject: [PATCH 1/1] Separate fetch and update steps --- modules/auto-upgrade.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 '' -A ${ -- 2.44.1