Merge master into staging-next

2019-02-16 09:29:54 +01:00
parent 5a322693f4 039f359a7d
commit 6fe10d2779
202 changed files with 4386 additions and 3640 deletions
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -37,9 +37,8 @@ in buildPythonPackage rec {

  checkInputs = [ pytest glibcLocales moto ];

-  buildInputs = [] ++ optional isDarwin libcxx;
+  buildInputs = [ cython ] ++ optional isDarwin libcxx;
  propagatedBuildInputs = [
-    cython
    dateutil
    scipy
    numexpr