X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/54354067fa17dcc3342cbb4b1d292d14f68c749a..c3a699cf8ab173f83a0b69dff23871124874b9d3:/overlays/pinch.nix diff --git a/overlays/pinch.nix b/overlays/pinch.nix index 2cae0b3..7d2940a 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -22,11 +22,11 @@ let ({ buildPythonPackage, fetchgit, git, backoff, mypy, }: buildPythonPackage rec { pname = "git-cache"; - version = "1.3.0"; + version = "1.3.1"; src = fetchgit { - url = "https://scottworley.com/git-cache.git"; + url = "https://git.scottworley.com/pub/git/git-cache"; rev = "v${version}"; - sha256 = "sha256-0HbtnS98im0sd2JIdUePBcspUskL2DY8ylQdyEC2sS0="; + sha256 = "0awz7f6avzw9fk9gp1kadj0nbmf1s60qic9zb6ww92zig3khg12k"; }; propagatedBuildInputs = [ backoff ]; checkInputs = [ git mypy ]; @@ -35,17 +35,21 @@ let }) { backoff = self.python3Packages.backoff or fallback-backoff; }; fallback-pinch = self.python3Packages.callPackage - ({ buildPythonPackage, fetchgit, nix, git, mypy, git-cache, }: + ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.2"; + version = "3.0.9"; src = fetchgit { - url = "https://scottworley.com/pinch.git"; + url = "https://git.scottworley.com/pub/git/pinch"; rev = "v${version}"; - sha256 = "sha256-bO0kMuaw/hkmDD1b8mkCDx0FAM6NIeUxvc+fOhHUXcs="; + sha256 = "sha256-D1XC8pmemdOpIEWvS0VH9Fguvp92FqpQfJj2TudfwRw="; }; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - checkInputs = [ nix git mypy ]; + checkInputs = [ nix_2_3 git mypy ]; + postInstall = '' + wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin + ''; doCheck = true; checkPhase = "./test.sh"; }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };