git-cache: 1.3.1 → 1.4.2

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

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 2cae0b36ddd0abfc12211127ecd801d38932b969..12751ec5737fd860b1e781294fd0d90d8356e6b8 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,51 +1,38 @@
 self: super:
 let
 
 self: super:
 let
 

-  # Pending upstream inclusion in https://github.com/NixOS/nixpkgs/pull/93377
-  fallback-backoff = self.python3Packages.callPackage ({ lib, buildPythonPackage
-    , fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, }:
-    buildPythonPackage rec {
-      pname = "backoff";
-      version = "1.10.0";
-      src = fetchFromGitHub {
-        owner = "litl";
-        repo = pname;
-        rev = "v${version}";
-        sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0";
-      };
-      format = "pyproject";
-      nativeBuildInputs = [ poetry ];
-      checkInputs = [ pytestCheckHook pytest-asyncio ];
-    }) { };
-

   fallback-git-cache = self.python3Packages.callPackage
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";
   fallback-git-cache = self.python3Packages.callPackage
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";

-        version = "1.3.0";
+        version = "1.4.2";

         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=";
+          hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0=";

         };
         propagatedBuildInputs = [ backoff ];
         checkInputs = [ git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
         };
         propagatedBuildInputs = [ backoff ];
         checkInputs = [ git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";

-      }) { backoff = self.python3Packages.backoff or fallback-backoff; };
+      }) { };

 
   fallback-pinch = self.python3Packages.callPackage
 
   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";
       buildPythonPackage rec {
         pname = "pinch";

-        version = "3.0.2";
+        version = "3.0.9";

         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 = "sha256-bO0kMuaw/hkmDD1b8mkCDx0FAM6NIeUxvc+fOhHUXcs=";
+          sha256 = "sha256-D1XC8pmemdOpIEWvS0VH9Fguvp92FqpQfJj2TudfwRw=";

         };
         };

+        buildInputs = [ makeWrapper ];

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