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 <nix/unpack-channel.nix>.

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 6aba72ce91f7fd988772994977d092fea66c3953..969846e52bb1d33588b89280b3ffb70dcf77d74c 100644 (file)
--- 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
       }) { 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";
       buildPythonPackage rec {
         pname = "pinch";

-        version = "3.0.3";
+        version = "3.0.4";

         src = fetchgit {
           url = "https://scottworley.com/pinch.git";
           rev = "v${version}";
         src = fetchgit {
           url = "https://scottworley.com/pinch.git";
           rev = "v${version}";

-          sha256 = "1j1y4h6m7fdb839h6igimqqjrdhr28wbzwa4b3grxp6szdpzkkra";
+          sha256 = "1i7v9vcjk599ffzwf3nq38y811cm6rnxriarqgpp3kwy52r91mi2";

         };
         };

+        buildInputs = [ makeWrapper ];

         propagatedBuildInputs = [ git-cache ];
         checkInputs = [ nix git mypy ];
         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; };
         doCheck = true;
         checkPhase = "./test.sh";
       }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };