X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/1b7ac5ff572bbdd96a5edc1768ab9192e4458db1..2a6cedfe22d12056af5240b983262e98cd5f131d:/default.nix diff --git a/default.nix b/default.nix index 6f297e7..2173f2a 100644 --- a/default.nix +++ b/default.nix @@ -21,7 +21,7 @@ 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"; @@ -29,10 +29,10 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git 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; }