25.11: pinch: 3.3.1 → 3.3.2

[auto-upgrade-with-pinch] / overlays / pinch.nix

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index d85be2d49e17741bce7616f4db98062c35570773..9422fe9556c1f69b5dc1978639ee29ea22b8a6b1 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,9 +1,39 @@
-self: super: {
-  pinch = super.writeShellScriptBin "pinch" ''
-    exec ${self.python3}/bin/python3 ${super.fetchgit {
-      url = "https://scottworley.com/pinch.git";
-      rev = "1.0";
-      sha256 = "0dlyx1vadppalpc1kr777k8ij3x04lz2m938y205xi7k5ab6j6fr";
-    }}/pinch.py "$@"
-  '';
-}
+self: super:
+let
+  fallback-git-cache = self.python3Packages.callPackage
+    ({ buildPythonPackage, fetchgit, setuptools, git, backoff, mypy, }:
+      buildPythonPackage rec {
+        pname = "git-cache";
+        version = "1.5.0";
+        src = fetchgit {
+          url = "https://git.scottworley.com/pub/git/git-cache";
+          rev = "v${version}";
+          hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
+        };
+        pyproject = true;
+        build-system = [ setuptools ];
+        propagatedBuildInputs = [ backoff ];
+        nativeCheckInputs = [ git mypy ];
+        doCheck = true;
+        checkPhase = "./test.sh";
+      }) { };
+
+  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; }