From: Scott Worley Date: Sun, 28 Aug 2022 16:44:28 +0000 (-0700) Subject: Rely on nixpkgs' python3Packages.backoff X-Git-Tag: v3.0.10~3 X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/f8305e1d95d00d2fd62b577e9193c52da2230dc8?ds=sidebyside;hp=86917026d1c2fb545c7f438cbc31bb85e4a5d520 Rely on nixpkgs' python3Packages.backoff --- diff --git a/default.nix b/default.nix index aae7f13..cc6f858 100644 --- a/default.nix +++ b/default.nix @@ -2,23 +2,6 @@ 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"; @@ -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-fallback { - backoff = - pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage - backoff-fallback { }); - }); + git-cache-fallback { }); nix_2_3 = pkgs.nix_2_3 or pkgs.nix; }