From 604501ec2e4bb2e8d39a1d16d8c38bf8069410da Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 23 Nov 2022 00:59:52 -0800 Subject: [PATCH 1/1] Rely on nixpkgs' python3Packages.backoff --- default.nix | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/default.nix b/default.nix index 918c9ec..9b932fb 100644 --- a/default.nix +++ b/default.nix @@ -1,24 +1,6 @@ { pkgs ? import { }, lint ? false }: -let - # Remove this package definition after https://github.com/NixOS/nixpkgs/pull/93377 reaches stable - backoff-fallback = { lib, buildPythonPackage, fetchPypi }: - buildPythonPackage rec { - pname = "backoff"; - version = "1.10.0"; - src = fetchPypi { - inherit pname version; - sha256 = "190rdpfhpjvb6bjh99fhdkgfsfkjwky7nz7b0nn5ah67z8hs1yxq"; - }; - meta = with lib; { - description = "Function decoration for backoff and retry"; - homepage = "https://github.com/litl/backoff"; - license = licenses.mit; - maintainers = with maintainers; [ chkno ]; - }; - }; - -in pkgs.python3Packages.callPackage +pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git, backoff, autopep8, mypy, pylint, }: buildPythonPackage rec { pname = "git-cache"; @@ -28,7 +10,4 @@ in pkgs.python3Packages.callPackage checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; doCheck = true; checkPhase = "./test.sh"; - }) { - backoff = pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage - backoff-fallback { }); - } + }) { } -- 2.44.1