Merge master into staging

2019-02-14 11:35:50 +01:00
parent ecfa775439 53a73b0914
commit a25d48cd4f
67 changed files with 3152 additions and 2951 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