X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/60e28cc7a4eb274c4f61c8e7e06668c684f964bc..HEAD:/overlays/pinch.nix diff --git a/overlays/pinch.nix b/overlays/pinch.nix index 12751ec..37c2e7d 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -1,18 +1,22 @@ 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.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,15 +25,15 @@ let ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.9"; + version = "3.1.0"; src = fetchgit { url = "https://git.scottworley.com/pub/git/pinch"; rev = "v${version}"; - sha256 = "sha256-D1XC8pmemdOpIEWvS0VH9Fguvp92FqpQfJj2TudfwRw="; + hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM="; }; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - checkInputs = [ nix_2_3 git mypy ]; + "${checkInputsName}" = [ nix_2_3 git mypy ]; postInstall = '' wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin '';