X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/df45b0111f016d06c4951c6df91359b6b9a15589..HEAD:/default.nix?ds=inline diff --git a/default.nix b/default.nix index 7744281..fd2bccf 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.5.0"; src = fetchgit { url = "https://git.scottworley.com/pub/git/git-cache"; rev = "v${version}"; - hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0="; + hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww="; }; propagatedBuildInputs = [ backoff ]; - checkInputs = [ git mypy ]; + "${checkInputsName}" = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; }; @@ -21,16 +25,23 @@ 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.1.0"; 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 ''; doCheck = true; checkPhase = "./test.sh"; + meta = { + description = "A replacement for `nix-channel --update`"; + homepage = "https://git.scottworley.com/pinch"; + license = pkgs.lib.licenses.gpl3; + maintainers = with pkgs.lib.maintainers; [ chkno ]; + }; }) { git-cache = pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage