about summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-01-24 00:42:02 +0100
committerGitHub <noreply@github.com>2019-01-24 00:42:02 +0100
commitb6da1ca26c33d2ca9c4881065f785835a6819e67 (patch)
tree5fc49ac322e01d1f8a269b56f14084e1c35912b6 /pkgs/development/python-modules
parent968eb6b3e0580e9ec63842c4e9597a102596a18c (diff)
parent77e6dcb338da4fdc813739eafe6394c41a6f31ec (diff)
downloadnixlib-b6da1ca26c33d2ca9c4881065f785835a6819e67.tar
nixlib-b6da1ca26c33d2ca9c4881065f785835a6819e67.tar.gz
nixlib-b6da1ca26c33d2ca9c4881065f785835a6819e67.tar.bz2
nixlib-b6da1ca26c33d2ca9c4881065f785835a6819e67.tar.lz
nixlib-b6da1ca26c33d2ca9c4881065f785835a6819e67.tar.xz
nixlib-b6da1ca26c33d2ca9c4881065f785835a6819e67.tar.zst
nixlib-b6da1ca26c33d2ca9c4881065f785835a6819e67.zip
Merge pull request #54400 from veprbl/pr/arrow_0.12.0
arrow-cpp, pythonPackages.pyarrow: 0.11.0 -> 0.12.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/pyarrow/default.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index d588ebb12e47..a66d8f7a0250 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { inherit python; };
@@ -13,10 +13,15 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
   propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
-  checkInputs = [ pandas pytest ];
+  checkInputs = [ hypothesis pandas pytest ];
 
   PYARROW_BUILD_TYPE = "release";
-  PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib";
+  PYARROW_CMAKE_OPTIONS = [
+    "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
+
+    # for some reason cmake won't set -std=c++11 for clang
+    "-DPYARROW_CXXFLAGS=-std=c++11"
+  ];
 
   preCheck = ''
     rm pyarrow/tests/test_jvm.py