X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/f7e9e6aa43db8fb02e2c36888134205a21263493..a222b37dee8407750871aa71bedd21317d881e89:/default.nix diff --git a/default.nix b/default.nix index 60cf14a..23bb053 100644 --- a/default.nix +++ b/default.nix @@ -9,11 +9,11 @@ let git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }: buildPythonPackage rec { pname = "git-cache"; - version = "1.4.3"; + version = "1.5.0"; src = fetchgit { url = "https://git.scottworley.com/pub/git/git-cache"; rev = "v${version}"; - hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI="; + hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww="; }; propagatedBuildInputs = [ backoff ]; "${checkInputsName}" = [ git mypy ]; @@ -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.0.14"; + 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; }