pinch: 3.0.11 → 3.0.12

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

diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix
index 87abfd74e788e0d4b130138495bf41d88ffb8aae..37f7ba54aab8f3084c722e26f087291f6d926bfa 100644 (file)
--- a/overlays/polite-merge.nix
+++ b/overlays/polite-merge.nix
@@ -1,18 +1,24 @@
-self: super: {
+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";
   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.3";
+        version = "2.4";

         src = fetchgit {
         src = fetchgit {

-          url = "https://scottworley.com/polite-merge.git";
+          url = "https://git.scottworley.com/pub/git/polite-merge";

           rev = version;
           rev = version;

-          sha256 = "0777h8pyvpml91w7lkj41shb16vpk2sbazlng44488zk3i8alq18";
+          sha256 = "1p6ivaay3bk4vvqqic7g23xrhkkq8z19zhsaxkav8kk90s2bmmza";

         };
         postUnpack = "patchShebangs .";
         };
         postUnpack = "patchShebangs .";

-        checkInputs = [ git ];
+        "${checkInputsName}" = [ git ];

         doCheck = true;
         preInstall = "export prefix";
       }) { };
         doCheck = true;
         preInstall = "export prefix";
       }) { };