ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-05 20:11:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87638 from veprbl/pr/arrow_cpp_0_17_0

Browse Source 
arrow-cpp: 0.16.0 -> 0.17.1
This commit is contained in:
Dmitry Kalinkin 2020-05-20 18:31:47 -04:00 committed by GitHub
commit 4a302d1b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,24 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost
, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl , brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl
, python, rapidjson, snappy, thrift, which, zlib, zstd , python3, rapidjson, snappy, thrift, which, zlib, zstd
, enableShared ? true }: , enableShared ? true }:
let let
parquet-testing = fetchFromGitHub { parquet-testing = fetchFromGitHub {
owner = "apache"; owner = "apache";
repo = "parquet-testing"; repo = "parquet-testing";
rev = "46c9e977f58f6c5ef1b81f782f3746b3656e5a8c"; rev = "bcd9ebcf9204a346df47204fe21b85c8d0498816";
sha256 = "1z2s6zh58nf484s0yraw7b1aqgx66dn2wzp1bzv9ndq03msklwly"; sha256 = "0m16pqzbvxiaradq088q5ai6fwnz9srbap996397znwppvva479b";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "arrow-cpp"; pname = "arrow-cpp";
version = "0.16.0"; version = "0.17.1";
src = fetchurl { src = fetchurl {
url = url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "1xdp1yni9i1cpml326s78qql1g832m800h7zjlqmk89983g94696"; sha256 = "18lyvbibfdw3w77cy5whbq7c6mshn5fg2bhvgw7v226a7cs1rifb";
}; };
sourceRoot = "apache-arrow-${version}/cpp"; sourceRoot = "apache-arrow-${version}/cpp";
@ -28,19 +28,18 @@ in stdenv.mkDerivation rec {
# ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/cmake_modules/ThirdpartyToolchain.cmake
# ./cpp/thirdparty/versions.txt # ./cpp/thirdparty/versions.txt
url = url =
"https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2"; "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2";
sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl"; sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl";
}; };
patches = [ patches = [
# patch to fix python-test # patch to fix python-test
./darwin.patch ./darwin.patch
# Adjust CMake target names to make -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON work.
# Remove this when updating to the next version. # fix musl build
(fetchpatch { (fetchpatch {
name = "arrow-use-upstream-cmake-target-names.patch"; url = "https://github.com/apache/arrow/commit/de4168786dfd8ab932f48801e0a7a6b8a370c19d.diff";
url = "https://github.com/apache/arrow/commit/396861b38d2f4e805db7c2ecd2c96fff0ca2678b.patch"; sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y";
sha256 = "0ki7nx858374anvwyi4szz5hgnnzv4fghdd05c38bzry9rfljgb1";
stripLen = 1; stripLen = 1;
}) })
] ++ lib.optionals (!enableShared) [ ] ++ lib.optionals (!enableShared) [
@ -66,8 +65,9 @@ in stdenv.mkDerivation rec {
thrift thrift
zlib zlib
zstd zstd
python.pkgs.python ] ++ lib.optionals enableShared [
python.pkgs.numpy python3.pkgs.python
python3.pkgs.numpy
]; ];
preConfigure = '' preConfigure = ''
@ -92,8 +92,6 @@ in stdenv.mkDerivation rec {
# Parquet options: # Parquet options:
"-DARROW_PARQUET=ON" "-DARROW_PARQUET=ON"
"-DPARQUET_BUILD_EXECUTABLES=ON" "-DPARQUET_BUILD_EXECUTABLES=ON"
"-DTHRIFT_COMPILER=${thrift}/bin/thrift"
"-DTHRIFT_VERSION=${thrift.version}"
] ++ lib.optionals (!enableShared) [ ] ++ lib.optionals (!enableShared) [
"-DARROW_BUILD_SHARED=OFF" "-DARROW_BUILD_SHARED=OFF"
"-DARROW_BOOST_USE_SHARED=OFF" "-DARROW_BOOST_USE_SHARED=OFF"

3
pkgs/development/python-modules/awkward/default.nix
View File

@ -3,7 +3,6 @@
, fetchPypi , fetchPypi
, numpy , numpy
, pandas , pandas
, pyarrow
, pytestrunner , pytestrunner
, pytest , pytest
, h5py , h5py
@ -19,7 +18,7 @@ buildPythonPackage rec {
}; };
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
checkInputs = [ pandas pyarrow pytest h5py ]; checkInputs = [ pandas pytest h5py ];
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];
checkPhase = '' checkPhase = ''

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

@ -1,28 +1,19 @@
{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: { lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
let let
_arrow-cpp = arrow-cpp.override { inherit python; }; _arrow-cpp = arrow-cpp.override { python3 = python; };
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyarrow"; pname = "pyarrow";
disabled = !isPy3k;
inherit (_arrow-cpp) version src; inherit (_arrow-cpp) version src;
patches = [
# Remove when updating pkgs.arrow-cpp to 0.17
(fetchpatch {
name = "ARROW-8106-fix-conversion-test";
url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch";
sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd";
stripLen = 1;
})
];
sourceRoot = "apache-arrow-${version}/python"; sourceRoot = "apache-arrow-${version}/python";
nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ numpy six ];
checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
PYARROW_BUILD_TYPE = "release"; PYARROW_BUILD_TYPE = "release";

1
pkgs/top-level/static.nix
View File

@ -166,7 +166,6 @@ in {
}); });
arrow-cpp = super.arrow-cpp.override { arrow-cpp = super.arrow-cpp.override {
enableShared = false; enableShared = false;
python = { pkgs = { python = null; numpy = null; }; };
}; };
boost = super.boost.override { boost = super.boost.override {
enableStatic = true; enableStatic = true;