Add some syncs to reduce risk on machines that can power off unexpectedly

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

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 0dad303f43242c049b5c3f4af50bfec1047348db..fe6fa3af10d24b974aa52c57a14d3942840b05c3 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,19 +1,35 @@
-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 {
       buildPythonPackage rec {

-        pname = "pinch";
-        version = "1.5";
+        pname = "git-cache";
+        version = "1.5.0";

         src = fetchgit {
         src = fetchgit {

-          url = "https://scottworley.com/pinch.git";
-          rev = version;
-          sha256 = "0si7z78iy8b5dfjs8ijy8bq9fwcfq51syqxijkc6mg5m7awwsf3l";
+          url = "https://git.scottworley.com/pub/git/git-cache";
+          rev = "v${version}";
+          hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";

         };
         };

-        checkInputs = [ nix git mypy ];
+        propagatedBuildInputs = [ backoff ];
+        nativeCheckInputs = [ git mypy ];

         doCheck = true;
         checkPhase = "./test.sh";
       }) { };
         doCheck = true;
         checkPhase = "./test.sh";
       }) { };

-}
+
+  fallback-pinch = self.python3Packages.callPackage
+    ({ buildPythonPackage, fetchgit, nix, git, mypy, git-cache, }:
+      buildPythonPackage rec {
+        pname = "pinch";
+        version = "3.3.1";
+        src = fetchgit {
+          url = "https://git.scottworley.com/pub/git/pinch";
+          rev = "v${version}";
+          hash = "sha256-fVlHwQX2o8GYZ/Oq5/m5v2L+KNpFoKWD8MbH4A3cV0s=";
+        };
+        propagatedBuildInputs = [ git-cache ];
+        nativeCheckInputs = [ nix git mypy ];
+        doCheck = true;
+        checkPhase = "./test.sh";
+      }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };
+
+in { pinch = super.pinch or fallback-pinch; }