Merge staging-next into master, closes #65497

2019-08-03 07:42:50 +02:00
parent 49f281d287 cd9846239a
commit 53328909da
296 changed files with 1443 additions and 1035 deletions
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -22,15 +22,27 @@ buildPythonPackage rec {
    sha256 = "0g8xl4158ngyhiynrkk72jpawnk4isznbijz0w085g269fps0vp2";
  };

-  LC_ALL = "en_US.UTF-8";
+  checkInputs = [
+    pytest
+    matplotlib
+    sympy
+    pytestcov
+  ];

  buildInputs = [ glibcLocales ];
-  checkInputs = [ matplotlib sympy pytestcov pytest ];
-  propagatedBuildInputs = [ coverage ipykernel jupyter_client nbformat pytest six ];
+
+  propagatedBuildInputs = [
+    coverage
+    ipykernel
+    jupyter_client
+    nbformat
+    pytest
+    six
+  ];

  # ignore impure tests
  checkPhase = ''
-    pytest tests --current-env --ignore tests/test_timeouts.py
+    pytest tests --ignore tests/test_timeouts.py
  '';

  meta = with lib; {