X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/c1a6f7a35de34fcfd241198d4c037e57a31e8558..3ec7fc1abdd4f021fc2bdc67c51a22e80328d1eb:/overlays/pinch.nix?ds=sidebyside

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 0dad303..7457960 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,19 +1,40 @@
-self: super: {
-  pinch = if builtins.hasAttr "pinch" super then
-    super.pinch
-  else
-    self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix, git, mypy, }:
+self: super:
+let
+
+  fallback-git-cache = self.python3Packages.callPackage
+    ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
-        pname = "pinch";
-        version = "1.5";
+        pname = "git-cache";
+        version = "1.3.1";
         src = fetchgit {
-          url = "https://scottworley.com/pinch.git";
-          rev = version;
-          sha256 = "0si7z78iy8b5dfjs8ijy8bq9fwcfq51syqxijkc6mg5m7awwsf3l";
+          url = "https://git.scottworley.com/pub/git/git-cache";
+          rev = "v${version}";
+          sha256 = "0awz7f6avzw9fk9gp1kadj0nbmf1s60qic9zb6ww92zig3khg12k";
         };
-        checkInputs = [ nix git mypy ];
+        propagatedBuildInputs = [ backoff ];
+        checkInputs = [ git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
       }) { };
-}
+
+  fallback-pinch = self.python3Packages.callPackage
+    ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
+      buildPythonPackage rec {
+        pname = "pinch";
+        version = "3.0.9";
+        src = fetchgit {
+          url = "https://git.scottworley.com/pub/git/pinch";
+          rev = "v${version}";
+          sha256 = "sha256-D1XC8pmemdOpIEWvS0VH9Fguvp92FqpQfJj2TudfwRw=";
+        };
+        buildInputs = [ makeWrapper ];
+        propagatedBuildInputs = [ git-cache ];
+        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; };
+
+in { pinch = super.pinch or fallback-pinch; }