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

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 37c2e7d..8c44608 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,12 +1,7 @@
 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, fetchgit, setuptools, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";
         version = "1.5.0";
@@ -15,28 +10,28 @@ let
           rev = "v${version}";
           hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
+        pyproject = true;
+        build-system = [ setuptools ];
         propagatedBuildInputs = [ backoff ];
-        "${checkInputsName}" = [ git mypy ];
+        nativeCheckInputs = [ git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
       }) { };
 
   fallback-pinch = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
+    ({ buildPythonPackage, fetchgit, setuptools, nix, git, mypy, git-cache, }:
       buildPythonPackage rec {
         pname = "pinch";
-        version = "3.1.0";
+        version = "3.3.1";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/pinch";
           rev = "v${version}";
-          hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM=";
+          hash = "sha256-fVlHwQX2o8GYZ/Oq5/m5v2L+KNpFoKWD8MbH4A3cV0s=";
         };
-        buildInputs = [ makeWrapper ];
+        pyproject = true;
+        build-system = [ setuptools ];
         propagatedBuildInputs = [ git-cache ];
-        "${checkInputsName}" = [ nix_2_3 git mypy ];
-        postInstall = ''
-          wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
-        '';
+        nativeCheckInputs = [ nix git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
       }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };