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

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 8e9633f..9422fe9 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,7 +1,7 @@
 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.5.0";
@@ -10,6 +10,8 @@ let
           rev = "v${version}";
           hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
+        pyproject = true;
+        build-system = [ setuptools ];
         propagatedBuildInputs = [ backoff ];
         nativeCheckInputs = [ git mypy ];
         doCheck = true;
@@ -17,21 +19,19 @@ let
       }) { };
 
   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.2";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/pinch";
           rev = "v${version}";
-          hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM=";
+          hash = "sha256-UB1hAEX7bD2TfdDv5EOWH1aaLluvzvpW80EjdCBuCCU=";
         };
-        buildInputs = [ makeWrapper ];
+        pyproject = true;
+        build-system = [ setuptools ];
         propagatedBuildInputs = [ git-cache ];
-        nativeCheckInputs = [ 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; };