From: Scott Worley <scottworley@scottworley.com>
Date: Thu, 12 Dec 2024 02:44:55 +0000 (-0800)
Subject: Drop 22.11 support: Just use "nativeCheckInputs"
X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/commitdiff_plain/a4ddb4117429b8bb2cfb6f23e8733a7b97edeac9

Drop 22.11 support: Just use "nativeCheckInputs"
---

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 37c2e7d..8e9633f 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,10 +1,5 @@
 self: super:
 let
-  checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs"
-    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
-  checkInputsName =
-    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
-
   fallback-git-cache = self.python3Packages.callPackage
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
@@ -16,7 +11,7 @@ let
           hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
         propagatedBuildInputs = [ backoff ];
-        "${checkInputsName}" = [ git mypy ];
+        nativeCheckInputs = [ git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
       }) { };
@@ -33,7 +28,7 @@ let
         };
         buildInputs = [ makeWrapper ];
         propagatedBuildInputs = [ git-cache ];
-        "${checkInputsName}" = [ nix_2_3 git mypy ];
+        nativeCheckInputs = [ nix_2_3 git mypy ];
         postInstall = ''
           wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
         '';
diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix
index 37f7ba5..c4a02a8 100644
--- a/overlays/polite-merge.nix
+++ b/overlays/polite-merge.nix
@@ -1,10 +1,4 @@
-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
@@ -18,7 +12,7 @@ in {
           sha256 = "1p6ivaay3bk4vvqqic7g23xrhkkq8z19zhsaxkav8kk90s2bmmza";
         };
         postUnpack = "patchShebangs .";
-        "${checkInputsName}" = [ git ];
+        nativeCheckInputs = [ git ];
         doCheck = true;
         preInstall = "export prefix";
       }) { };