Use nix from nixpkgs (not from PATH) to avoid nixUnstable

diff --git a/Changelog b/Changelog
index ed58b284d25a355306eef2b9189df8f915114154..7946d7b740ba28e2fdbf8aef4be45bd536f53840 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,8 @@
 ## [Unreleased]
 ## [Unreleased]

+### Changed
+- Use nix from nixpkgs rather than from PATH.  This is needed when the nix in
+PATH is nixUnstable-3.0pre20201020_e0ca98c or later because nix commit
+787469c7b66aec12ab6847e7db2cdc8aef5c325e removed <nix/unpack-channel.nix>.

 
 
 ## [3.0.3] - 2021-05-20
 
 
 ## [3.0.3] - 2021-05-20

diff --git a/default.nix b/default.nix
index 913f546ee06d497f2bee7b635dbfd6dade403e9b..8c8fbd31e47b708f726cdf82b92b415e636beb6e 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -34,14 +34,18 @@ let
       checkPhase = "./test.sh";
     };
 
       checkPhase = "./test.sh";
     };
 

-in pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git
+  , autopep8, makeWrapper, mypy, pylint, git-cache, }:

   buildPythonPackage rec {
     pname = "pinch";
     version = "3.0.4-pre";
     src = lib.cleanSource ./.;
   buildPythonPackage rec {
     pname = "pinch";
     version = "3.0.4-pre";
     src = lib.cleanSource ./.;

+    buildInputs = [ makeWrapper ];

     propagatedBuildInputs = [ git-cache ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     propagatedBuildInputs = [ git-cache ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];

+    postInstall = ''
+      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin
+    '';

     doCheck = true;
     checkPhase = "./test.sh";
   }) {
     doCheck = true;
     checkPhase = "./test.sh";
   }) {