summary refs log tree commit diff
path: root/pkgs/development/python-modules/pandas
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-02-17 07:58:47 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-02-17 08:05:24 +0100
commitf7f1a2f54ef2b744a26e37418dd6354bc46aa20a (patch)
tree03b40b737111f3677fbf508dce58a29cfc81fc1b /pkgs/development/python-modules/pandas
parent705167a5dceb53befd22f4e6184bbfba0813b73d (diff)
parentc904c2ec09cbee8b46bee136e062e611d249cdf2 (diff)
downloadnixpkgs-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar
nixpkgs-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.gz
nixpkgs-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.bz2
nixpkgs-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.lz
nixpkgs-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.xz
nixpkgs-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.zst
nixpkgs-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.zip
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
Diffstat (limited to 'pkgs/development/python-modules/pandas')
-rw-r--r--pkgs/development/python-modules/pandas/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index f0c357d6ccc..2562975e592 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -16,6 +16,7 @@
 , lxml
 , html5lib
 , beautifulsoup4
+, hypothesis
 , openpyxl
 , tables
 , xlwt
@@ -28,16 +29,17 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.23.4";
+  version = "0.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4";
+    sha256 = "435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af";
   };
 
-  checkInputs = [ pytest glibcLocales moto ];
+  checkInputs = [ pytest glibcLocales moto hypothesis ];
 
-  buildInputs = [ cython ] ++ optional isDarwin libcxx;
+  nativeBuildInputs = [ cython ];
+  buildInputs = optional isDarwin libcxx;
   propagatedBuildInputs = [
     dateutil
     scipy