X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/096b39f1858ec3486682c63fa93f7477dac76489..a811aa4a1c703ab559390310e21cab7625b8b947:/overlays/pinch.nix?ds=sidebyside

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 420d594..d716720 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,57 +1,66 @@
 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, }:
+  fallback-git-cache = self.python3Packages.callPackage (
+    {
+      buildPythonPackage,
+      fetchgit,
+      setuptools,
+      git,
+      backoff,
+      mypy,
+    }:
     buildPythonPackage rec {
-      pname = "backoff";
-      version = "1.10.0";
-      src = fetchFromGitHub {
-        owner = "litl";
-        repo = pname;
+      pname = "git-cache";
+      version = "1.5.0";
+      src = fetchgit {
+        url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";
-        sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0";
+        hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
       };
-      format = "pyproject";
-      nativeBuildInputs = [ poetry ];
-      checkInputs = [ pytestCheckHook pytest-asyncio ];
-    }) { };
-
-  fallback-git-cache = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
-      buildPythonPackage rec {
-        pname = "git-cache";
-        version = "1.3.1";
-        src = fetchgit {
-          url = "https://scottworley.com/git-cache.git";
-          rev = "v${version}";
-          sha256 = "0awz7f6avzw9fk9gp1kadj0nbmf1s60qic9zb6ww92zig3khg12k";
-        };
-        propagatedBuildInputs = [ backoff ];
-        checkInputs = [ git mypy ];
-        doCheck = true;
-        checkPhase = "./test.sh";
-      }) { backoff = self.python3Packages.backoff or fallback-backoff; };
+      pyproject = true;
+      build-system = [ setuptools ];
+      propagatedBuildInputs = [ backoff ];
+      nativeCheckInputs = [
+        git
+        mypy
+      ];
+      doCheck = true;
+      checkPhase = "./test.sh";
+    }
+  ) { };
 
-  fallback-pinch = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix, git, makeWrapper, mypy, git-cache, }:
-      buildPythonPackage rec {
-        pname = "pinch";
-        version = "3.0.7";
-        src = fetchgit {
-          url = "https://scottworley.com/pinch.git";
-          rev = "v${version}";
-          sha256 = "sha256-BMESwx3uUVOFekiXr1LSGNF4DXexT26awzIQIzw/iZY=";
-        };
-        buildInputs = [ makeWrapper ];
-        propagatedBuildInputs = [ git-cache ];
-        checkInputs = [ nix git mypy ];
-        postInstall = ''
-          wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin
-        '';
-        doCheck = true;
-        checkPhase = "./test.sh";
-      }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };
+  fallback-pinch = self.python3Packages.callPackage (
+    {
+      buildPythonPackage,
+      fetchgit,
+      setuptools,
+      nix,
+      git,
+      mypy,
+      git-cache,
+    }:
+    buildPythonPackage rec {
+      pname = "pinch";
+      version = "3.3.2";
+      src = fetchgit {
+        url = "https://git.scottworley.com/pub/git/pinch";
+        rev = "v${version}";
+        hash = "sha256-UB1hAEX7bD2TfdDv5EOWH1aaLluvzvpW80EjdCBuCCU=";
+      };
+      pyproject = true;
+      build-system = [ setuptools ];
+      propagatedBuildInputs = [ git-cache ];
+      nativeCheckInputs = [
+        nix
+        git
+        mypy
+      ];
+      doCheck = true;
+      checkPhase = "./test.sh";
+    }
+  ) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };
 
-in { pinch = super.pinch or fallback-pinch; }
+in
+{
+  pinch = super.pinch or fallback-pinch;
+}