From: Scott Worley <scottworley@scottworley.com>
Date: Thu, 25 May 2023 01:58:39 +0000 (-0700)
Subject: Adapt to nixpkgs' nativeCheckInputs change
X-Git-Tag: v3.0.11~2
X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/ae63e97430175267f8177a7c7d4a5325eaea929e?ds=sidebyside;hp=d5abffb3c868e3cf98e565a1e158eeaa333292d1

Adapt to nixpkgs' nativeCheckInputs change

nixpkgs commit f39abbc3500451fc00c80fed71b0f6f7bba8b6a4, first released in
23.05, requires that everyone move their checkInputs to nativeCheckInputs.
To build both before and after this change, we detect whether we're before
or after this change by reading the manual & behave appropriately.  :/
---

diff --git a/Changelog b/Changelog
index 04b4bd9..167f16f 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
 ### Changed
 - Specify license
 - Dropped "pylint: disable=no-self-use"
+- Adapt to nixpkgs nativeCheckInputs change
 
 
 ## [3.0.10] - 2022-11-23
diff --git a/default.nix b/default.nix
index 94f525b..caebd9c 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,10 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 let
+  checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs"
+    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
+  checkInputsName =
+    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
 
   git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
@@ -12,7 +16,7 @@ let
         hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0=";
       };
       propagatedBuildInputs = [ backoff ];
-      checkInputs = [ git mypy ];
+      "${checkInputsName}" = [ git mypy ];
       doCheck = true;
       checkPhase = "./test.sh";
     };
@@ -25,7 +29,8 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
     src = lib.cleanSource ./.;
     buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];
-    checkInputs = [ nix_2_3 git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    "${checkInputsName}" = [ nix_2_3 git mypy ]
+      ++ lib.optionals lint [ autopep8 pylint ];
     postInstall = ''
       wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
     '';