Use polite-merge for merging

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

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index 8bf21aaaf988c5d3b0b5d6648ca403785276d05f..e52720d8af0d1777da12f50be1148786c39d2052 100644 (file)
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -28,7 +28,8 @@ let
         # Update channels
         (
           cd /etc/nixos
         # Update channels
         (
           cd /etc/nixos

-          ${pkgs.keyedgit cfg.key}/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
         )
 
           ${pkgs.pinch}/bin/pinch update channels
         )
 


@@ -71,11 +72,12 @@ in {
         '';
       };
 
         '';
       };
 

-      key = mkOption {
+      keys = mkOption {

         type = types.path;
         description = ''
         type = types.path;
         description = ''

-          GPG key that signs updates.  Updates are only merged if the commit
-          at the tip of the remote branch is signed with this key.
+          File containing GPG keys that sign updates.  Updates are only merged
+          if the commit at the tip of the remote branch is signed with one of
+          these keys.

         '';
       };
 
         '';
       };
 


@@ -135,6 +137,7 @@ in {
     nixpkgs.overlays = [
       (import ../overlays/keyedgit.nix)
       (import ../overlays/pinch.nix)
     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}
       (self: super: {
         auto-upgrade = super.writeShellScriptBin "auto-upgrade" ''
           /run/wrappers/bin/sudo ${auto-upgrade-script}