New git URLs

[auto-upgrade-with-pinch] / overlays / pinch.nix

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 6aba72ce91f7fd988772994977d092fea66c3953..05da5bea64dac62850a9dc6ef144463ff5c42fdd 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -22,11 +22,11 @@ let
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";

-        version = "1.3.0";
+        version = "1.3.1";

         src = fetchgit {
         src = fetchgit {

-          url = "https://scottworley.com/git-cache.git";
+          url = "https://git.scottworley.com/pub/git/git-cache";

           rev = "v${version}";
           rev = "v${version}";

-          sha256 = "sha256-0HbtnS98im0sd2JIdUePBcspUskL2DY8ylQdyEC2sS0=";
+          sha256 = "0awz7f6avzw9fk9gp1kadj0nbmf1s60qic9zb6ww92zig3khg12k";

         };
         propagatedBuildInputs = [ backoff ];
         checkInputs = [ git mypy ];
         };
         propagatedBuildInputs = [ backoff ];
         checkInputs = [ git mypy ];


@@ -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.7";

         src = fetchgit {
         src = fetchgit {

-          url = "https://scottworley.com/pinch.git";
+          url = "https://git.scottworley.com/pub/git/pinch";

           rev = "v${version}";
           rev = "v${version}";

-          sha256 = "1j1y4h6m7fdb839h6igimqqjrdhr28wbzwa4b3grxp6szdpzkkra";
+          sha256 = "sha256-BMESwx3uUVOFekiXr1LSGNF4DXexT26awzIQIzw/iZY=";

         };
         };

+        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; };