X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/71848ed255ce6d76acb202186db811555b3a4b44..75076e7da897635c486c47b1c741190e5e54656d:/default.nix?ds=sidebyside diff --git a/default.nix b/default.nix index 0c56fe4..31a6398 100644 --- a/default.nix +++ b/default.nix @@ -2,31 +2,14 @@ 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"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "https://git.scottworley.com/pub/git/git-cache"; rev = "v${version}"; - sha256 = "0ml1myhmd9mw1z5bwni9fhvx7h9dknhmqq4nyci9n5lvrhbmcdc9"; + hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0="; }; propagatedBuildInputs = [ backoff ]; checkInputs = [ git mypy ]; @@ -38,7 +21,7 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git , autopep8, makeWrapper, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.9-pre"; + version = "3.0.10-pre"; src = lib.cleanSource ./.; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ 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; }