pinch 1.5 -> 3.0.2

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 0dad303f43242c049b5c3f4af50bfec1047348db..2cae0b36ddd0abfc12211127ecd801d38932b969 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,19 +1,53 @@
-self: super: {
-  pinch = if builtins.hasAttr "pinch" super then
-    super.pinch
-  else
-    self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix, git, mypy, }:
+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, }:
+    buildPythonPackage rec {
+      pname = "backoff";
+      version = "1.10.0";
+      src = fetchFromGitHub {
+        owner = "litl";
+        repo = pname;
+        rev = "v${version}";
+        sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0";
+      };
+      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.0";
+        src = fetchgit {
+          url = "https://scottworley.com/git-cache.git";
+          rev = "v${version}";
+          sha256 = "sha256-0HbtnS98im0sd2JIdUePBcspUskL2DY8ylQdyEC2sS0=";
+        };
+        propagatedBuildInputs = [ backoff ];
+        checkInputs = [ git mypy ];
+        doCheck = true;
+        checkPhase = "./test.sh";
+      }) { backoff = self.python3Packages.backoff or fallback-backoff; };
+
+  fallback-pinch = self.python3Packages.callPackage
+    ({ buildPythonPackage, fetchgit, nix, git, mypy, git-cache, }:

       buildPythonPackage rec {
         pname = "pinch";
       buildPythonPackage rec {
         pname = "pinch";

-        version = "1.5";
+        version = "3.0.2";

         src = fetchgit {
           url = "https://scottworley.com/pinch.git";
         src = fetchgit {
           url = "https://scottworley.com/pinch.git";

-          rev = version;
-          sha256 = "0si7z78iy8b5dfjs8ijy8bq9fwcfq51syqxijkc6mg5m7awwsf3l";
+          rev = "v${version}";
+          sha256 = "sha256-bO0kMuaw/hkmDD1b8mkCDx0FAM6NIeUxvc+fOhHUXcs=";

         };
         };

+        propagatedBuildInputs = [ git-cache ];

         checkInputs = [ nix git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
         checkInputs = [ 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; }