X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/567ba6eb5941408322eaf704af3dacbb51fd9f0d..a811aa4a1c703ab559390310e21cab7625b8b947:/overlays/polite-merge.nix

diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix
index 37f7ba5..85e80c5 100644
--- a/overlays/polite-merge.nix
+++ b/overlays/polite-merge.nix
@@ -1,26 +1,26 @@
-self: super:
-let
-  checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs"
-    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
-  checkInputsName =
-    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
-in {
-  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 = "2.4";
-        src = fetchgit {
-          url = "https://git.scottworley.com/pub/git/polite-merge";
-          rev = version;
-          sha256 = "1p6ivaay3bk4vvqqic7g23xrhkkq8z19zhsaxkav8kk90s2bmmza";
-        };
-        postUnpack = "patchShebangs .";
-        "${checkInputsName}" = [ git ];
-        doCheck = true;
-        preInstall = "export prefix";
-      }) { };
+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 = "2.4.2";
+          src = fetchgit {
+            url = "https://git.scottworley.com/pub/git/polite-merge";
+            rev = "v${version}";
+            hash = "sha256-CUNKLCwIFwwVaA9opw9yql5AGej/ozQv8k1YR/cfV4I=";
+          };
+          postUnpack = "patchShebangs .";
+          nativeCheckInputs = [ git ];
+          doCheck = true;
+          preInstall = "export prefix";
+        }
+      ) { };
 }
-