X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/d06918bc9c80208be1f75162021bfe308b9a0161..86666a85eaeea98a38e0cbae449ddce1a8866225:/default.nix diff --git a/default.nix b/default.nix index b3fc3a5..518a2dc 100644 --- a/default.nix +++ b/default.nix @@ -1,32 +1,60 @@ { pkgs ? import { }, lint ? false }: let - git-cache-fallback = { buildPythonPackage, fetchgit, git, mypy, }: + + # 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.0.0"; + version = "1.4.1"; src = fetchgit { - url = "https://scottworley.com/git-cache.git"; + url = "https://git.scottworley.com/pub/git/git-cache"; rev = "v${version}"; - sha256 = "06mzjc424988n2s1h25x2bi3mxbk2pnba31zkjljgw4cgw2p9036"; + sha256 = "0ml1myhmd9mw1z5bwni9fhvx7h9dknhmqq4nyci9n5lvrhbmcdc9"; }; + propagatedBuildInputs = [ backoff ]; checkInputs = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; }; -in pkgs.python3Packages.callPackage -({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }: +in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git + , autopep8, makeWrapper, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.0-pre"; + version = "3.0.9"; src = lib.cleanSource ./.; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; + checkInputs = [ nix_2_3 git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; + postInstall = '' + wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin + ''; doCheck = true; checkPhase = "./test.sh"; }) { git-cache = pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage - git-cache-fallback { }); + git-cache-fallback { + backoff = + pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage + backoff-fallback { }); + }); + nix_2_3 = pkgs.nix_2_3 or pkgs.nix; }