When becoming other users, cd to /

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

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 0dad303f43242c049b5c3f4af50bfec1047348db..8e9633f89cf6a5c9f0cebc6046a51102253b39fb 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,19 +1,39 @@
-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_2_3, git, makeWrapper, mypy, git-cache, }:
+      buildPythonPackage rec {
+        pname = "pinch";
+        version = "3.1.0";
+        src = fetchgit {
+          url = "https://git.scottworley.com/pub/git/pinch";
+          rev = "v${version}";
+          hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM=";
+        };
+        buildInputs = [ makeWrapper ];
+        propagatedBuildInputs = [ git-cache ];
+        nativeCheckInputs = [ 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; }