X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/f10d09382c13b2510e3f723b6f05c3cf38d61a11..2fb219b96b7ebff700cc8ce92d4a4add16104b71:/default.nix diff --git a/default.nix b/default.nix index 94f525b..9d4aa33 100644 --- a/default.nix +++ b/default.nix @@ -1,18 +1,22 @@ { pkgs ? import { }, lint ? false }: let + checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs" + (builtins.readFile ); + checkInputsName = + if checkInputsAreNative then "nativeCheckInputs" else "checkInputs"; git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }: buildPythonPackage rec { pname = "git-cache"; - version = "1.4.2"; + version = "1.4.3"; src = fetchgit { url = "https://git.scottworley.com/pub/git/git-cache"; rev = "v${version}"; - hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0="; + hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI="; }; propagatedBuildInputs = [ backoff ]; - checkInputs = [ git mypy ]; + "${checkInputsName}" = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; }; @@ -21,11 +25,12 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git , autopep8, makeWrapper, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.10"; + version = "3.0.14-pre"; src = lib.cleanSource ./.; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - checkInputs = [ nix_2_3 git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; + "${checkInputsName}" = [ nix_2_3 git mypy ] + ++ lib.optionals lint [ autopep8 pylint ]; postInstall = '' wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin '';