X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/cf837bc8ca10ada6ef814ce6f8eac7876b2c0a29..8ec8e7607393df1f7be14ab20e5dc1b3a8e1832d:/default.nix

diff --git a/default.nix b/default.nix
index 00ddac9..43f4bef 100644
--- a/default.nix
+++ b/default.nix
@@ -6,34 +6,35 @@ let
   checkInputsName =
     if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
 
-  git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
+  git-cache-fallback =
+    { buildPythonPackage, setuptools, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchgit {
         url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";
-        hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI=";
+        hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
       };
+      pyproject = true;
+      build-system = [ setuptools ];
       propagatedBuildInputs = [ backoff ];
       "${checkInputsName}" = [ git mypy ];
       doCheck = true;
       checkPhase = "./test.sh";
     };
 
-in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
-  , autopep8, makeWrapper, mypy, pylint, git-cache, }:
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, setuptools, nix
+  , git, autopep8, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
-    version = "3.0.12";
+    version = "3.3.2";
     src = lib.cleanSource ./.;
-    buildInputs = [ makeWrapper ];
+    pyproject = true;
+    build-system = [ setuptools ];
     propagatedBuildInputs = [ git-cache ];
-    "${checkInputsName}" = [ nix_2_3 git mypy ]
+    "${checkInputsName}" = [ nix git mypy ]
       ++ lib.optionals lint [ autopep8 pylint ];
-    postInstall = ''
-      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
-    '';
     doCheck = true;
     checkPhase = "./test.sh";
     meta = {
@@ -46,5 +47,4 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
         git-cache-fallback { });
-    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
   }