Use polite-merge for merging

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index 66d857f74a1d1f9ce7e21750a7ba3f84abceafe2..e52720d8af0d1777da12f50be1148786c39d2052 100644 (file)
--- 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}

diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix
new file mode 100644 (file)
index 0000000..49d8d3b
--- /dev/null
+++ b/overlays/polite-merge.nix
@@ -0,0 +1,20 @@
+self: super: {
+  polite-merge = if builtins.hasAttr "polite-merge" super then
+    super.polite-merge
+  else
+    self.callPackage ({ fetchgit, git, stdenv, }:
+      stdenv.mkDerivation rec {
+        pname = "polite-merge";
+        version = "1.0";
+        src = fetchgit {
+          url = "https://scottworley.com/polite-merge.git";
+          rev = version;
+          sha256 = "1q3iya5ifpcnmmvxhaphlvvq674yzwkgi3cyr6i3yflqks7zf81p";
+        };
+        postUnpack = "patchShebangs .";
+        checkInputs = [ git ];
+        doCheck = true;
+        preInstall = "export prefix";
+      }) { };
+}
+