X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/42dbaf9df4f644bf053e4a37847803283860ec18..refs/heads/master:/default.nix diff --git a/default.nix b/default.nix index 777a767..43f4bef 100644 --- a/default.nix +++ b/default.nix @@ -6,7 +6,8 @@ let checkInputsName = if checkInputsAreNative then "nativeCheckInputs" else "checkInputs"; - git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }: + git-cache-fallback = + { buildPythonPackage, setuptools, fetchgit, git, backoff, mypy, }: buildPythonPackage rec { pname = "git-cache"; version = "1.5.0"; @@ -15,25 +16,25 @@ let rev = "v${version}"; hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww="; }; + pyproject = true; + build-system = [ setuptools ]; propagatedBuildInputs = [ backoff ]; "${checkInputsName}" = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; }; -in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git - , autopep8, makeWrapper, mypy, pylint, git-cache, }: +in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, setuptools, nix + , git, autopep8, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.3.0-pre"; + version = "3.3.2"; src = lib.cleanSource ./.; - buildInputs = [ makeWrapper ]; + pyproject = true; + build-system = [ setuptools ]; propagatedBuildInputs = [ git-cache ]; "${checkInputsName}" = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; - postInstall = '' - wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin - ''; doCheck = true; checkPhase = "./test.sh"; meta = {