X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/9d0c0d71309239cfdc6c19996d2b730fdf06a692..318cb8e22fa7dcdf691149b520b5d24428ee3cc9:/modules/auto-upgrade.nix?ds=inline

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index 66d857f..e52720d 100644
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -28,7 +28,8 @@ let
         # Update channels
         (
           cd /etc/nixos
-          ${pkgs.keyedgit cfg.keys}/bin/git pull --ff-only --verify-signatures
+          ${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
         )
 
@@ -136,6 +137,7 @@ in {
     nixpkgs.overlays = [
       (import ../overlays/keyedgit.nix)
       (import ../overlays/pinch.nix)
+      (import ../overlays/polite-merge.nix)
       (self: super: {
         auto-upgrade = super.writeShellScriptBin "auto-upgrade" ''
           /run/wrappers/bin/sudo ${auto-upgrade-script}