ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47832 from veprbl/pr/arrow_0.10.0

Browse Source 
arrow-cpp: 0.9.0 -> 0.10.0
This commit is contained in:
Jörg Thalheim 2018-10-04 23:34:17 +01:00 committed by GitHub
commit a363ed1071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/arrow-cpp/darwin.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/cmake_modules/FindPythonLibsNew.cmake b/cmake_modules/FindPythonLibsNew.cmake
--- a/cmake_modules/FindPythonLibsNew.cmake
+++ b/cmake_modules/FindPythonLibsNew.cmake
@@ -117,6 +117,7 @@ list(GET _PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
list(GET _PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
list(GET _PYTHON_VALUES 8 PYTHON_LIBRARY_PATH)
list(GET _PYTHON_VALUES 9 PYTHON_OTHER_LIBS)
+string(REPLACE "-lncurses" "" PYTHON_OTHER_LIBS "${PYTHON_OTHER_LIBS}")
# Make sure the Python has the same pointer-size as the chosen compiler
# Skip the check on OS X, it doesn't consistently have CMAKE_SIZEOF_VOID_P defined

7
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -2,15 +2,18 @@
stdenv.mkDerivation rec {
name = "arrow-cpp-${version}";
version = "0.9.0";
version = "0.10.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
};
sourceRoot = "apache-arrow-${version}/cpp";
# patch to fix python-test
patches = [ ./darwin.patch ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost python.pkgs.python python.pkgs.numpy ];

12
pkgs/development/libraries/parquet-cpp/api.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/parquet/arrow/reader.cc b/src/parquet/arrow/reader.cc
--- a/src/parquet/arrow/reader.cc
+++ b/src/parquet/arrow/reader.cc
@@ -1421,7 +1421,7 @@ Status StructImpl::DefLevelsToNullArray(std::shared_ptr<Buffer>* null_bitmap_out
const int16_t* def_levels_data;
size_t def_levels_length;
RETURN_NOT_OK(GetDefLevels(&def_levels_data, &def_levels_length));
- RETURN_NOT_OK(AllocateEmptyBitmap(pool_, def_levels_length, &null_bitmap));
+ RETURN_NOT_OK(GetEmptyBitmap(pool_, def_levels_length, &null_bitmap));
uint8_t* null_bitmap_ptr = null_bitmap->mutable_data();
for (size_t i = 0; i < def_levels_length; i++) {
if (def_levels_data[i] < struct_def_level_) {

6
pkgs/development/libraries/parquet-cpp/default.nix
View File

@ -2,13 +2,15 @@
stdenv.mkDerivation rec {
name = "parquet-cpp-${version}";
version = "1.4.0";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz";
sha256 = "1kn7pjzi5san5f05qbl8l8znqsa3f9cq9bflfr4s2jfwr7k9p2aj";
sha256 = "19nwqahc0igr0jfprbf2m86rmzz6zicw4z7b8z832wbsyc904wli";
};
patches = [ ./api.patch ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];

10
pkgs/development/python-modules/pyarrow/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
let
_arrow-cpp = arrow-cpp.override { inherit python;};
@ -7,18 +7,14 @@ in
buildPythonPackage rec {
pname = "pyarrow";
version = "0.9.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
};
inherit (_arrow-cpp) version src;
sourceRoot = "apache-arrow-${version}/python";
nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
checkInputs = [ pandas pytest pytestrunner ];
checkInputs = [ pandas pytest pytestrunner JPype1 ];
PYARROW_BUILD_TYPE = "release";
PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib";