Stop using ancient nix_2_3

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 143e57409cdca23ba7713e290571d4f3fc2b027d..2173f2a16d4f4269b06534e754117db881f521ba 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -9,11 +9,11 @@ let
   git-cache-fallback = { 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 ];
@@ -21,18 +21,18 @@ let
       checkPhase = "./test.sh";
     };
 
-in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git
   , autopep8, makeWrapper, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
-    version = "3.0.15-pre";
+    version = "3.2.0-pre";
     src = lib.cleanSource ./.;
     buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];
-    "${checkInputsName}" = [ nix_2_3 git mypy ]
+    "${checkInputsName}" = [ nix git mypy ]
       ++ lib.optionals lint [ autopep8 pylint ];
     postInstall = ''
-      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
+      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin
     '';
     doCheck = true;
     checkPhase = "./test.sh";
@@ -46,5 +46,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;
   }