dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #146823 from cpcloud/arrow-cpp-6-0-1

Browse Source 
arrow-cpp: 6.0.0 -> 6.0.1
This commit is contained in:
Dmitry Kalinkin 2021-11-26 15:53:07 -05:00 committed by GitHub
commit fc9ee3bc0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@
, zstd
, enableShared ? !stdenv.hostPlatform.isStatic
, enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin
, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin)
# boost/process is broken in 1.69 on darwin, but fixed in 1.70 and
# non-existent in older versions
# see https://github.com/boostorg/process/issues/55
@ -53,8 +54,8 @@ let
arrow-testing = fetchFromGitHub {
owner = "apache";
repo = "arrow-testing";
rev = "a60b715263d9bbf7e744527fb0c084b693f58043";
hash = "sha256-Dz1dCV0m5Y24qzXdVaqrZ7hK3MRSb4GF0PXrjMAsjZU=";
rev = "1d8525e109a12a8c67c489eba48715a199609153";
hash = "sha256-tesDW/1yRyhZtpLbPvCVEsocs6KtstYofxB5GiSMEFM=";
};
parquet-testing = fetchFromGitHub {
@ -67,16 +68,16 @@ let
in
stdenv.mkDerivation rec {
pname = "arrow-cpp";
version = "6.0.0";
version = "6.0.1";
src = fetchurl {
url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
hash = "sha256-adJo+egtPr71la0b3IPUywKyDBgZRqaGMfZkXXwfepA=";
hash = "sha256-N4az0t+VTQeLPmj5jS5a7Lqj+irM8HXXo6E8GHucUpQ=";
};
sourceRoot = "apache-arrow-${version}/cpp";
ARROW_JEMALLOC_URL = jemalloc.src;
${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = jemalloc.src;
ARROW_MIMALLOC_URL = fetchFromGitHub {
# From
@ -140,7 +141,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
patchShebangs build-support/
substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
--replace 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";'
'';
cmakeFlags = [
@ -155,6 +156,7 @@ stdenv.mkDerivation rec {
"-DARROW_COMPUTE=ON"
"-DARROW_CSV=ON"
"-DARROW_DATASET=ON"
"-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
"-DARROW_JSON=ON"
"-DARROW_PLASMA=ON"
# Disable Python for static mode because openblas is currently broken there.

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

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }:
{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }:
let
_arrow-cpp = arrow-cpp.override { python3 = python; };
@ -44,6 +44,9 @@ buildPythonPackage rec {
# Deselect a parquet dataset test because it erroneously fails to find the
# pyarrow._dataset module.
"--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties"
] ++ lib.optionals stdenv.isDarwin [
# Requires loopback networking
"--deselect=pyarrow/tests/test_ipc.py::test_socket_"
];
dontUseSetuptoolsCheck = true;

2
pkgs/tools/misc/parquet-tools/default.nix
View File

@ -32,7 +32,7 @@ buildPythonApplication rec {
--replace 'thrift = "^0.13.0"' 'thrift = "*"' \
--replace 'halo = "^0.0.29"' 'halo = "*"'
substituteInPlace tests/test_inspect.py \
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version 6.0.0" \
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
--replace "serialized_size: 2222" "serialized_size: 2221"
'';