From 567ba6eb5941408322eaf704af3dacbb51fd9f0d Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 24 May 2023 19:18:06 -0700 Subject: [PATCH 1/1] 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. :/ --- overlays/pinch.nix | 8 ++++++-- overlays/polite-merge.nix | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/overlays/pinch.nix b/overlays/pinch.nix index dfb9eac..07daaf7 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -1,5 +1,9 @@ self: super: let + checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs" + (builtins.readFile ); + checkInputsName = + if checkInputsAreNative then "nativeCheckInputs" else "checkInputs"; fallback-git-cache = self.python3Packages.callPackage ({ buildPythonPackage, fetchgit, git, backoff, mypy, }: @@ -12,7 +16,7 @@ let hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0="; }; propagatedBuildInputs = [ backoff ]; - checkInputs = [ git mypy ]; + "${checkInputsName}" = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; }) { }; @@ -29,7 +33,7 @@ let }; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - checkInputs = [ nix_2_3 git mypy ]; + "${checkInputsName}" = [ 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 bc73b15..37f7ba5 100644 --- a/overlays/polite-merge.nix +++ b/overlays/polite-merge.nix @@ -1,4 +1,10 @@ -self: super: { +self: super: +let + checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs" + (builtins.readFile ); + checkInputsName = + if checkInputsAreNative then "nativeCheckInputs" else "checkInputs"; +in { polite-merge = if builtins.hasAttr "polite-merge" super then super.polite-merge else @@ -12,7 +18,7 @@ self: super: { sha256 = "1p6ivaay3bk4vvqqic7g23xrhkkq8z19zhsaxkav8kk90s2bmmza"; }; postUnpack = "patchShebangs ."; - checkInputs = [ git ]; + "${checkInputsName}" = [ git ]; doCheck = true; preInstall = "export prefix"; }) { }; -- 2.44.1