X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/8bcd33744c2db7f03ae31ca85aa0582e66745b4f..a4ddb4117429b8bb2cfb6f23e8733a7b97edeac9:/overlays/pinch.nix?ds=sidebyside diff --git a/overlays/pinch.nix b/overlays/pinch.nix index 7dcddb0..8e9633f 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -1,22 +1,17 @@ self: super: let - checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs" - (builtins.readFile ); - checkInputsName = - if checkInputsAreNative then "nativeCheckInputs" else "checkInputs"; - fallback-git-cache = self.python3Packages.callPackage ({ 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 ]; + nativeCheckInputs = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; }) { }; @@ -25,15 +20,15 @@ let ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.10"; + version = "3.1.0"; src = fetchgit { url = "https://git.scottworley.com/pub/git/pinch"; rev = "v${version}"; - hash = "sha256-U3TOTfYvM1ONF9DJrWxfhjVQnY7GD96ru6A2Yj01lcg="; + hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM="; }; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - "${checkInputsName}" = [ nix_2_3 git mypy ]; + nativeCheckInputs = [ nix_2_3 git mypy ]; postInstall = '' wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin '';