From: Scott Worley <scottworley@scottworley.com>
Date: Fri, 14 Jan 2022 00:01:09 +0000 (-0800)
Subject: Use nix 2.3 because 2.4 broke <nix/unpack-channel.nix>
X-Git-Tag: v3.0.6~4
X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/5144c1d383be505bef11f8191b41cbf3cf4a8e49?ds=sidebyside

Use nix 2.3 because 2.4 broke <nix/unpack-channel.nix>

Nix commit 787469c7b66aec12ab6847e7db2cdc8aef5c325e removed
<nix/unpack-channel.nix>.
---

diff --git a/Changelog b/Changelog
index 152bb35..f6943ec 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
 ### Changed
 - Deprecate pinch.
 - Show the channel URL being fetched.
+- Use nix 2.3 because 2.4 broke <nix/unpack-channel.nix>.
 
 
 ## [3.0.5] - 2021-07-09
diff --git a/default.nix b/default.nix
index 3c3f9ca..fae46cc 100644
--- a/default.nix
+++ b/default.nix
@@ -34,7 +34,7 @@ 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";
@@ -42,9 +42,9 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git
     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;
   }