]> git.scottworley.com Git - pinch/commitdiff
Rely on nixpkgs' python3Packages.backoff
authorScott Worley <scottworley@scottworley.com>
Sun, 28 Aug 2022 16:44:28 +0000 (09:44 -0700)
committerScott Worley <scottworley@scottworley.com>
Wed, 23 Nov 2022 09:13:50 +0000 (01:13 -0800)
default.nix

index aae7f13c089b1018720490c1ad7e408af15b82c8..cc6f858c7627d1ffee931052d4a80d020eacd3c3 100644 (file)
@@ -2,23 +2,6 @@
 
 let
 
 
 let
 
-  # 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";
   git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";
@@ -51,10 +34,6 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
   }) {
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
   }) {
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
-        git-cache-fallback {
-          backoff =
-            pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
-              backoff-fallback { });
-        });
+        git-cache-fallback { });
     nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
   }
     nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
   }