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 1336a0925837696eaf56351035b1cd186dfa6c0a..12a866ba552789341b6a668d80e6290ba991b56e 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 ## [Unreleased]
 ### Changed
 - Specify license
 ## [Unreleased]
 ### Changed
 - Specify license

+- Adapt to nixpkgs nativeCheckInputs change

 
 
 ## [1.4.2] - 2022-11-23
 
 
 ## [1.4.2] - 2022-11-23

diff --git a/default.nix b/default.nix
index a161d41c6c6dd5debbdfea977f105caa4b459a05..d2337001f358cca6a852fa39f7b5452404d3bed1 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,13 +1,19 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 

-pkgs.python3Packages.callPackage
+let
+  checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs"
+    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
+  checkInputsName =
+    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
+in pkgs.python3Packages.callPackage

 ({ lib, buildPythonPackage, nix, git, backoff, autopep8, mypy, pylint, }:
   buildPythonPackage rec {
     pname = "git-cache";
     version = "1.4.2";
     src = lib.cleanSource ./.;
     propagatedBuildInputs = [ backoff ];
 ({ lib, buildPythonPackage, nix, git, backoff, autopep8, mypy, pylint, }:
   buildPythonPackage rec {
     pname = "git-cache";
     version = "1.4.2";
     src = lib.cleanSource ./.;
     propagatedBuildInputs = [ backoff ];

-    checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    "${checkInputsName}" = [ nix git mypy ]
+      ++ lib.optionals lint [ autopep8 pylint ];

     doCheck = true;
     checkPhase = "./test.sh";
     meta = {
     doCheck = true;
     checkPhase = "./test.sh";
     meta = {