Merge branch 'staging-next'

Security fixes for a few packages are included.

pkgs/development/python-modules/Cython/default.nix

@@ -48,6 +48,8 @@ in buildPythonPackage rec {
         ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
   '';
 
+  doCheck = !stdenv.isDarwin;
+
   patches = [
     # The following is in GitHub in 0.28.3 but not in the `sdist`.
     # https://github.com/cython/cython/issues/2319

pkgs/development/python-modules/arxiv2bib/default.nix

@@ -14,7 +14,6 @@ buildPythonPackage rec {
     sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg";
   };
 
-  # Required for tests only
   checkInputs = [ mock ];
 
   checkPhase = "${python.interpreter} -m unittest discover -s tests";

pkgs/development/python-modules/dbus/default.nix

@@ -15,12 +15,12 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus dbus-glib ]
-    ++ lib.optionals doCheck [ dbus.out pygobject3 ]
     # My guess why it's sometimes trying to -lncurses.
     # It seems not to retain the dependency anyway.
     ++ lib.optional (! python ? modules) ncurses;
 
   doCheck = true;
+  checkInputs = [ dbus.out pygobject3 ];
 
   meta = {
     description = "Python DBus bindings";

pkgs/development/python-modules/gensim/default.nix

@@ -5,6 +5,7 @@
 , six
 , scipy
 , smart_open
+, scikitlearn, testfixtures, unittest2
 }:
 
 buildPythonPackage rec {
@@ -15,20 +16,20 @@ buildPythonPackage rec {
     sha256 = "78ed9b6ac35f104542f3bee0386d71ddf9432d74c153065d2ea9f6baf10e5b49";
   };
 
-  propagatedBuildInputs = [ smart_open numpy six scipy
-                            # scikitlearn testfixtures unittest2 # for tests
-                          ];
-  doCheck = false;
+  propagatedBuildInputs = [ smart_open numpy six scipy ];
+
+  checkInputs = [ scikitlearn testfixtures unittest2 ];
 
   # Two tests fail.
-
+  #
   # ERROR: testAddMorphemesToEmbeddings (gensim.test.test_varembed_wrapper.TestVarembed)
   # ImportError: Could not import morfessor.
   # This package is not in nix
-
+  #
   # ERROR: testWmdistance (gensim.test.test_fasttext_wrapper.TestFastText)
   # ImportError: Please install pyemd Python package to compute WMD.
   # This package is not in nix
+  doCheck = false;
 
   meta = {
     description = "Topic-modelling library";

pkgs/development/python-modules/ldap/default.nix

@@ -1,6 +1,6 @@
 { buildPythonPackage, fetchPypi
 , pyasn1, pyasn1-modules, pytest
-, openldap, cyrus_sasl }:
+, openldap, cyrus_sasl, stdenv }:
 
 buildPythonPackage rec {
   pname = "python-ldap";
@@ -26,4 +26,6 @@ buildPythonPackage rec {
 
     py.test
   '';
+
+  doCheck = !stdenv.isDarwin;
 }

pkgs/development/python-modules/markdown/default.nix

@@ -25,4 +25,4 @@ buildPythonPackage rec {
     homepage = https://github.com/Python-Markdown/markdown;
     license = lib.licenses.bsd3;
   };
-}
+}

pkgs/development/python-modules/tqdm/default.nix

@@ -5,6 +5,7 @@
 , coverage
 , glibcLocales
 , flake8
+, stdenv
 }:
 
 buildPythonPackage rec {
@@ -26,6 +27,8 @@ buildPythonPackage rec {
 
   LC_ALL="en_US.UTF-8";
 
+  doCheck = !stdenv.isDarwin;
+
   meta = {
     description = "A Fast, Extensible Progress Meter";
     homepage = https://github.com/tqdm/tqdm;