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 152bb358b59afe005d9c3c4d0fa14d1f762ad17a..f6943ec3ba9863a16b1540733a3c2d7fb015ebfb 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
 ### Changed
 - Deprecate pinch.
 - Show the channel URL being fetched.
 ### 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
 
 
 ## [3.0.5] - 2021-07-09

diff --git a/default.nix b/default.nix
index 3c3f9ca61bdc1698b7d3a89624754b9293f5c75b..fae46cc392e669bc6afcdd1eb0797072aa321350 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -34,7 +34,7 @@ let
       checkPhase = "./test.sh";
     };
 
       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";
   , 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 ];
     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 = ''
     postInstall = ''

-      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin
+      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin

     '';
     doCheck = true;
     checkPhase = "./test.sh";
     '';
     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 { });
         });
             pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
               backoff-fallback { });
         });

+    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;

   }
   }