Announce test names as they are run.

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 920b1086d2559741c00d9a5f0b6275df9feda8eb..fae46cc392e669bc6afcdd1eb0797072aa321350 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -34,17 +34,17 @@ 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";

-    version = "3.0.5";
+    version = "3.0.6-pre";

     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;

   }
   }