X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/bbc804af5ed161ec3aea729002bf6b0e57af4357..HEAD:/overlays/pinch.nix

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 05da5be..37c2e7d 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,54 +1,41 @@
 self: super:
 let
-
-  # Pending upstream inclusion in https://github.com/NixOS/nixpkgs/pull/93377
-  fallback-backoff = self.python3Packages.callPackage ({ lib, buildPythonPackage
-    , fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, }:
-    buildPythonPackage rec {
-      pname = "backoff";
-      version = "1.10.0";
-      src = fetchFromGitHub {
-        owner = "litl";
-        repo = pname;
-        rev = "v${version}";
-        sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0";
-      };
-      format = "pyproject";
-      nativeBuildInputs = [ poetry ];
-      checkInputs = [ pytestCheckHook pytest-asyncio ];
-    }) { };
+  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 {
         pname = "git-cache";
-        version = "1.3.1";
+        version = "1.5.0";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/git-cache";
           rev = "v${version}";
-          sha256 = "0awz7f6avzw9fk9gp1kadj0nbmf1s60qic9zb6ww92zig3khg12k";
+          hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
         propagatedBuildInputs = [ backoff ];
-        checkInputs = [ git mypy ];
+        "${checkInputsName}" = [ git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
-      }) { backoff = self.python3Packages.backoff or fallback-backoff; };
+      }) { };
 
   fallback-pinch = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix, git, makeWrapper, mypy, git-cache, }:
+    ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
       buildPythonPackage rec {
         pname = "pinch";
-        version = "3.0.7";
+        version = "3.1.0";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/pinch";
           rev = "v${version}";
-          sha256 = "sha256-BMESwx3uUVOFekiXr1LSGNF4DXexT26awzIQIzw/iZY=";
+          hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM=";
         };
         buildInputs = [ makeWrapper ];
         propagatedBuildInputs = [ git-cache ];
-        checkInputs = [ nix git mypy ];
+        "${checkInputsName}" = [ nix_2_3 git mypy ];
         postInstall = ''
-          wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin
+          wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
         '';
         doCheck = true;
         checkPhase = "./test.sh";