From: Scott Worley Date: Mon, 7 Jun 2021 19:22:23 +0000 (-0700) Subject: pinch: 3.0.3 -> 3.0.4 X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/commitdiff_plain/d0a8d1234efbae54055b58f938a4cec4ac9058d4?hp=b7b747fd5e9780aef64cb744440ca4d69f47f0d2 pinch: 3.0.3 -> 3.0.4 Use nix from nixpkgs rather than from PATH. This is needed when the nix in PATH is nixUnstable-3.0pre20201020_e0ca98c or later because nix commit 787469c7b66aec12ab6847e7db2cdc8aef5c325e removed . --- diff --git a/overlays/pinch.nix b/overlays/pinch.nix index 6aba72c..969846e 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -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, git, makeWrapper, mypy, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.3"; + version = "3.0.4"; src = fetchgit { url = "https://scottworley.com/pinch.git"; rev = "v${version}"; - sha256 = "1j1y4h6m7fdb839h6igimqqjrdhr28wbzwa4b3grxp6szdpzkkra"; + sha256 = "1i7v9vcjk599ffzwf3nq38y811cm6rnxriarqgpp3kwy52r91mi2"; }; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; checkInputs = [ nix git mypy ]; + postInstall = '' + wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin + ''; doCheck = true; checkPhase = "./test.sh"; }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };