X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/c631c875b146d02059e7a9fe05185807ce011b5a..6b7d6a8a278a8f1d1430ef15f4fbe74fb45e3fa7:/default.nix?ds=sidebyside diff --git a/default.nix b/default.nix index fd2bccf..23bb053 100644 --- a/default.nix +++ b/default.nix @@ -21,19 +21,15 @@ let checkPhase = "./test.sh"; }; -in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git - , autopep8, makeWrapper, mypy, pylint, git-cache, }: +in pkgs.python3Packages.callPackage +({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.1.0"; + version = "3.3.1-pre"; src = lib.cleanSource ./.; - buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - "${checkInputsName}" = [ nix_2_3 git mypy ] + "${checkInputsName}" = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; - postInstall = '' - wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin - ''; doCheck = true; checkPhase = "./test.sh"; meta = { @@ -46,5 +42,4 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git git-cache = pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage git-cache-fallback { }); - nix_2_3 = pkgs.nix_2_3 or pkgs.nix; }