X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/3926efa5b3b5cc043870dde1eb909d0af75f2be2..701e41fe3e4f8a6b61cefd3761794d899ce25d46:/overlays/pinch.nix?ds=sidebyside

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index dfb9eac..9422fe9 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,38 +1,37 @@
 self: super:
 let
-
   fallback-git-cache = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
+    ({ buildPythonPackage, fetchgit, setuptools, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";
-        version = "1.4.2";
+        version = "1.5.0";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/git-cache";
           rev = "v${version}";
-          hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0=";
+          hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
+        pyproject = true;
+        build-system = [ setuptools ];
         propagatedBuildInputs = [ backoff ];
-        checkInputs = [ 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.0.10";
+        version = "3.3.2";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/pinch";
           rev = "v${version}";
-          hash = "sha256-U3TOTfYvM1ONF9DJrWxfhjVQnY7GD96ru6A2Yj01lcg=";
+          hash = "sha256-UB1hAEX7bD2TfdDv5EOWH1aaLluvzvpW80EjdCBuCCU=";
         };
-        buildInputs = [ makeWrapper ];
+        pyproject = true;
+        build-system = [ setuptools ];
         propagatedBuildInputs = [ git-cache ];
-        checkInputs = [ 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; };