Start on 3.0.9

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 3c3f9ca61bdc1698b7d3a89624754b9293f5c75b..0c56fe45dc43594befe8526b3a517e3d86a9c7ca 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -24,7 +24,7 @@ let
       pname = "git-cache";
       version = "1.4.1";
       src = fetchgit {
-        url = "https://scottworley.com/git-cache.git";
+        url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";
         sha256 = "0ml1myhmd9mw1z5bwni9fhvx7h9dknhmqq4nyci9n5lvrhbmcdc9";
       };
@@ -34,17 +34,17 @@ let
       checkPhase = "./test.sh";
     };
 
-in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
   , autopep8, makeWrapper, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
-    version = "3.0.6-pre";
+    version = "3.0.9-pre";
     src = lib.cleanSource ./.;
     buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];
-    checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    checkInputs = [ nix_2_3 git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     postInstall = ''
-      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin
+      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
     '';
     doCheck = true;
     checkPhase = "./test.sh";
@@ -56,4 +56,5 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git
             pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
               backoff-fallback { });
         });
+    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
   }