Use polite-merge for merging

[auto-upgrade-with-pinch] / overlays / polite-merge.nix

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";
+      }) { };
+}
+