X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/f10d09382c13b2510e3f723b6f05c3cf38d61a11..fb819850734c2ca68640736444c4c86ba15ccd70:/default.nix

diff --git a/default.nix b/default.nix
index 94f525b..1374022 100644
--- a/default.nix
+++ b/default.nix
@@ -1,34 +1,35 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 let
+  checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs"
+    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
+  checkInputsName =
+    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
 
   git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";
-      version = "1.4.2";
+      version = "1.5.0";
       src = fetchgit {
         url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";
-        hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0=";
+        hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
       };
       propagatedBuildInputs = [ backoff ];
-      checkInputs = [ git mypy ];
+      "${checkInputsName}" = [ git mypy ];
       doCheck = true;
       checkPhase = "./test.sh";
     };
 
-in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
-  , autopep8, makeWrapper, mypy, pylint, git-cache, }:
+in pkgs.python3Packages.callPackage
+({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
-    version = "3.0.10";
+    version = "3.3.0-pre";
     src = lib.cleanSource ./.;
-    buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];
-    checkInputs = [ nix_2_3 git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
-    postInstall = ''
-      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
-    '';
+    "${checkInputsName}" = [ nix git mypy ]
+      ++ lib.optionals lint [ autopep8 pylint ];
     doCheck = true;
     checkPhase = "./test.sh";
     meta = {
@@ -41,5 +42,4 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
         git-cache-fallback { });
-    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
   }