Start on 3.0.3

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index b3fc3a544a1cba59d941578590d18c813db00533..faf474248c04430906781810f187ff5df6dfec96 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,15 +1,34 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 let
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 let

-  git-cache-fallback = { buildPythonPackage, fetchgit, git, mypy, }:
+
+  # Remove after https://github.com/NixOS/nixpkgs/pull/93377 reaches stable
+  backoff-fallback = { 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 ];
+    };
+
+  git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:

     buildPythonPackage rec {
       pname = "git-cache";
     buildPythonPackage rec {
       pname = "git-cache";

-      version = "1.0.0";
+      version = "1.2.1";

       src = fetchgit {
         url = "https://scottworley.com/git-cache.git";
         rev = "v${version}";
       src = fetchgit {
         url = "https://scottworley.com/git-cache.git";
         rev = "v${version}";

-        sha256 = "06mzjc424988n2s1h25x2bi3mxbk2pnba31zkjljgw4cgw2p9036";
+        sha256 = "16yh75176pnbzf48ak7q8lpfpr6digi130i5drxs6k2y9nf7g1jz";

       };
       };

+      propagatedBuildInputs = [ backoff ];

       checkInputs = [ git mypy ];
       doCheck = true;
       checkPhase = "./test.sh";
       checkInputs = [ git mypy ];
       doCheck = true;
       checkPhase = "./test.sh";


@@ -19,7 +38,7 @@ in pkgs.python3Packages.callPackage
 ({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
 ({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";

-    version = "3.0.0-pre";
+    version = "3.0.3-pre";

     src = lib.cleanSource ./.;
     propagatedBuildInputs = [ git-cache ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     src = lib.cleanSource ./.;
     propagatedBuildInputs = [ git-cache ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];


@@ -28,5 +47,9 @@ in pkgs.python3Packages.callPackage
   }) {
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
   }) {
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage

-        git-cache-fallback { });
+        git-cache-fallback {
+          backoff =
+            pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
+              backoff-fallback { });
+        });

   }
   }