git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146823 from cpcloud/arrow-cpp-6-0-1

arrow-cpp: 6.0.0 -> 6.0.1

commitfc9ee3bc0b9e6d30f76f4b37084711ae03114e21 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateFri 26 Nov 2021, 15:53 (5 years ago) parent650120debe3336
3 files changed+13−8
compare with master
unifiedsplit
pkgs/development/libraries/arrow-cpp/default.nix+8−6 pkgs/development/python-modules/pyarrow/default.nix+4−1 pkgs/tools/misc/parquet-tools/default.nix+1−1
pkgs/development/libraries/arrow-cpp/default.nix+8−6
@@ -38,6 +38,7 @@
3838, zstd
3939, enableShared ? !stdenv.hostPlatform.isStatic
4040, enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin
41+, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin)
4142 # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and
4243 # non-existent in older versions
4344 # see https://github.com/boostorg/process/issues/55
@@ -53,8 +54,8 @@ let
5354 arrow-testing = fetchFromGitHub {
5455 owner = "apache";
5556 repo = "arrow-testing";
56− rev = "a60b715263d9bbf7e744527fb0c084b693f58043";
57− hash = "sha256-Dz1dCV0m5Y24qzXdVaqrZ7hK3MRSb4GF0PXrjMAsjZU=";
57+ rev = "1d8525e109a12a8c67c489eba48715a199609153";
58+ hash = "sha256-tesDW/1yRyhZtpLbPvCVEsocs6KtstYofxB5GiSMEFM=";
5859 };
5960
6061 parquet-testing = fetchFromGitHub {
@@ -67,16 +68,16 @@ let
6768in
6869stdenv.mkDerivation rec {
6970 pname = "arrow-cpp";
70− version = "6.0.0";
71+ version = "6.0.1";
7172
7273 src = fetchurl {
7374 url =
7475 "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
75− hash = "sha256-adJo+egtPr71la0b3IPUywKyDBgZRqaGMfZkXXwfepA=";
76+ hash = "sha256-N4az0t+VTQeLPmj5jS5a7Lqj+irM8HXXo6E8GHucUpQ=";
7677 };
7778 sourceRoot = "apache-arrow-${version}/cpp";
7879
79− ARROW_JEMALLOC_URL = jemalloc.src;
80+ ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = jemalloc.src;
8081
8182 ARROW_MIMALLOC_URL = fetchFromGitHub {
8283 # From
@@ -140,7 +141,7 @@ stdenv.mkDerivation rec {
140141 preConfigure = ''
141142 patchShebangs build-support/
142143 substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \
143− --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
144+ --replace 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";'
144145 '';
145146
146147 cmakeFlags = [
@@ -155,6 +156,7 @@ stdenv.mkDerivation rec {
155156 "-DARROW_COMPUTE=ON"
156157 "-DARROW_CSV=ON"
157158 "-DARROW_DATASET=ON"
159+ "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
158160 "-DARROW_JSON=ON"
159161 "-DARROW_PLASMA=ON"
160162 # Disable Python for static mode because openblas is currently broken there.
pkgs/development/python-modules/pyarrow/default.nix+4−1
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }:
1+{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }:
22
33let
44 _arrow-cpp = arrow-cpp.override { python3 = python; };
@@ -44,6 +44,9 @@ buildPythonPackage rec {
4444 # Deselect a parquet dataset test because it erroneously fails to find the
4545 # pyarrow._dataset module.
4646 "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties"
47+ ] ++ lib.optionals stdenv.isDarwin [
48+ # Requires loopback networking
49+ "--deselect=pyarrow/tests/test_ipc.py::test_socket_"
4750 ];
4851
4952 dontUseSetuptoolsCheck = true;
pkgs/tools/misc/parquet-tools/default.nix+1−1
@@ -32,7 +32,7 @@ buildPythonApplication rec {
3232 --replace 'thrift = "^0.13.0"' 'thrift = "*"' \
3333 --replace 'halo = "^0.0.29"' 'halo = "*"'
3434 substituteInPlace tests/test_inspect.py \
35− --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version 6.0.0" \
35+ --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
3636 --replace "serialized_size: 2222" "serialized_size: 2221"
3737 '';
3838