X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/d07240cce51e23669d8187d6ea71debe5bba7d26..752d37291d831f952f4998e75b4180a4690fc979:/overlays/pinch.nix

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index f984b92..546ccdc 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,44 +1,66 @@
 self: super:
 let
-  checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs"
-    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
-  checkInputsName =
-    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
+  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-git-cache = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
-      buildPythonPackage rec {
-        pname = "git-cache";
-        version = "1.4.3";
-        src = fetchgit {
-          url = "https://git.scottworley.com/pub/git/git-cache";
-          rev = "v${version}";
-          hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI=";
-        };
-        propagatedBuildInputs = [ backoff ];
-        "${checkInputsName}" = [ 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.3";
+      src = fetchgit {
+        url = "https://git.scottworley.com/pub/git/pinch";
+        rev = "v${version}";
+        hash = "sha256-+SdKvGPofOJn0lBOSP4SH3i2WGpBuEXmLzzpYD1epgc=";
+      };
+      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; };
 
-  fallback-pinch = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
-      buildPythonPackage rec {
-        pname = "pinch";
-        version = "3.0.11";
-        src = fetchgit {
-          url = "https://git.scottworley.com/pub/git/pinch";
-          rev = "v${version}";
-          hash = "sha256-VxlwqZVUzHOej+5dU03jdL/erJGXEKvOeNAs6K9/D9M=";
-        };
-        buildInputs = [ makeWrapper ];
-        propagatedBuildInputs = [ git-cache ];
-        "${checkInputsName}" = [ 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; }
+in
+{
+  pinch = super.pinch or fallback-pinch;
+}