X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/408142ea40708f6c0bf853838fb877be29cf93a9..91b2b7c6c4873633718078d1ff5a775e21bf06f3:/overlays/pinch.nix

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 5a2eaff..fe6fa3a 100644
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,42 +1,33 @@
 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, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";
-        version = "1.4.3";
+        version = "1.5.0";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/git-cache";
           rev = "v${version}";
-          hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI=";
+          hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
         propagatedBuildInputs = [ backoff ];
-        "${checkInputsName}" = [ git mypy ];
+        nativeCheckInputs = [ git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
       }) { };
 
   fallback-pinch = self.python3Packages.callPackage
-    ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
+    ({ buildPythonPackage, fetchgit, nix, git, mypy, git-cache, }:
       buildPythonPackage rec {
         pname = "pinch";
-        version = "3.0.13";
+        version = "3.3.1";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/pinch";
           rev = "v${version}";
-          hash = "sha256-GGl16qDinNWe7qVnkfFJWNZiLb71sLZTHQ04a9g/26k=";
+          hash = "sha256-fVlHwQX2o8GYZ/Oq5/m5v2L+KNpFoKWD8MbH4A3cV0s=";
         };
-        buildInputs = [ makeWrapper ];
         propagatedBuildInputs = [ git-cache ];
-        "${checkInputsName}" = [ nix_2_3 git mypy ];
-        postInstall = ''
-          wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
-        '';
+        nativeCheckInputs = [ nix git mypy ];
         doCheck = true;
         checkPhase = "./test.sh";
       }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };