Narrow sudoers to runAs=root

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

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 0dad303f43242c049b5c3f4af50bfec1047348db..d71672068917bbd625fe67347a71e00bc3f1996f 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,19 +1,66 @@
-self: super: {
-  pinch = if builtins.hasAttr "pinch" super then
-    super.pinch
-  else
-    self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix, git, mypy, }:
-      buildPythonPackage rec {
-        pname = "pinch";
-        version = "1.5";
-        src = fetchgit {
-          url = "https://scottworley.com/pinch.git";
-          rev = version;
-          sha256 = "0si7z78iy8b5dfjs8ijy8bq9fwcfq51syqxijkc6mg5m7awwsf3l";
-        };
-        checkInputs = [ nix git mypy ];
-        doCheck = true;
-        checkPhase = "./test.sh";
-      }) { };
+self: super:
+let
+  fallback-git-cache = self.python3Packages.callPackage (
+    {
+      buildPythonPackage,
+      fetchgit,
+      setuptools,
+      git,
+      backoff,
+      mypy,
+    }:
+    buildPythonPackage rec {
+      pname = "git-cache";
+      version = "1.5.0";
+      src = fetchgit {
+        url = "https://git.scottworley.com/pub/git/git-cache";
+        rev = "v${version}";
+        hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
+      };
+      pyproject = true;
+      build-system = [ setuptools ];
+      propagatedBuildInputs = [ backoff ];
+      nativeCheckInputs = [
+        git
+        mypy
+      ];
+      doCheck = true;
+      checkPhase = "./test.sh";
+    }
+  ) { };
+
+  fallback-pinch = self.python3Packages.callPackage (
+    {
+      buildPythonPackage,
+      fetchgit,
+      setuptools,
+      nix,
+      git,
+      mypy,
+      git-cache,
+    }:
+    buildPythonPackage rec {
+      pname = "pinch";
+      version = "3.3.2";
+      src = fetchgit {
+        url = "https://git.scottworley.com/pub/git/pinch";
+        rev = "v${version}";
+        hash = "sha256-UB1hAEX7bD2TfdDv5EOWH1aaLluvzvpW80EjdCBuCCU=";
+      };
+      pyproject = true;
+      build-system = [ setuptools ];
+      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;
 }