X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/9ee71b8de80b57ed5851203b581ac09b3792d2c8..ff6f6673d8cc06004c43088ac37578eaa1e4667d:/default.nix?ds=sidebyside diff --git a/default.nix b/default.nix index 9e2a5f1..920b108 100644 --- a/default.nix +++ b/default.nix @@ -1,11 +1,59 @@ { pkgs ? import { }, lint ? false }: -pkgs.python3Packages.callPackage -({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, }: + +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"; + src = fetchgit { + url = "https://scottworley.com/git-cache.git"; + rev = "v${version}"; + sha256 = "0ml1myhmd9mw1z5bwni9fhvx7h9dknhmqq4nyci9n5lvrhbmcdc9"; + }; + propagatedBuildInputs = [ backoff ]; + checkInputs = [ git mypy ]; + doCheck = true; + checkPhase = "./test.sh"; + }; + +in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git + , autopep8, makeWrapper, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "2.1.0-pre"; + version = "3.0.5"; src = lib.cleanSource ./.; + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ git-cache ]; checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; + postInstall = '' + wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin + ''; doCheck = true; checkPhase = "./test.sh"; - }) { } + }) { + git-cache = + pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage + git-cache-fallback { + backoff = + pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage + backoff-fallback { }); + }); + }