From 3ec7fc1abdd4f021fc2bdc67c51a22e80328d1eb Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 23 Nov 2022 01:42:32 -0800 Subject: [PATCH 1/1] Rely on nixpkgs' python3Packages.backoff --- overlays/pinch.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/overlays/pinch.nix b/overlays/pinch.nix index 7d2940a..7457960 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -1,23 +1,6 @@ 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 { @@ -32,7 +15,7 @@ let checkInputs = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; - }) { backoff = self.python3Packages.backoff or fallback-backoff; }; + }) { }; fallback-pinch = self.python3Packages.callPackage ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }: -- 2.44.1