X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/1b183c2c1b3efc8ce94a42941e15f64be25db893..de3c28c2fb3d8fdbe1106d893c9b1e7b8be50406:/default.nix diff --git a/default.nix b/default.nix index 6f297e7..29096f8 100644 --- a/default.nix +++ b/default.nix @@ -21,18 +21,18 @@ let checkPhase = "./test.sh"; }; -in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git +in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git , autopep8, makeWrapper, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.2.0-pre"; + version = "3.2.0"; 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 + wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin ''; doCheck = true; checkPhase = "./test.sh"; @@ -46,5 +46,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; }