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

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