From 92c45083e54fa06c1c54de593e4df83100e80e01 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 20 Nov 2021 19:11:09 -0500 Subject: [PATCH 1/5] arrow-cpp: 6.0.0 -> 6.0.1 --- pkgs/development/libraries/arrow-cpp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 36e98bde7030..7182a5f76786 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -53,8 +53,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,12 +67,12 @@ 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"; From c5a0962ddd85dd6ed1794c64f79ba2ba92b1bab0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 15:07:37 -0500 Subject: [PATCH 2/5] arrow-cpp: fix sandboxed build on darwin --- pkgs/development/libraries/arrow-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7182a5f76786..bcf4aeb2ddc0 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -140,7 +140,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 = [ From 9fff252dcf573a265bcdac81cfa482fa0b862a7b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 15:47:16 -0500 Subject: [PATCH 3/5] python3Packages.pyarrow: fix sandboxed build on darwin --- pkgs/development/python-modules/pyarrow/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index e9510d9552ce..7360cab01f37 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, 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; From e3e77ee8a4c116d781273d0b189eaf24046ea4f0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 20:54:50 -0500 Subject: [PATCH 4/5] arrow-cpp: build without jemalloc on aarch64-darwin to fix build --- pkgs/development/libraries/arrow-cpp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index bcf4aeb2ddc0..574ba3b12501 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -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 @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { }; 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 @@ -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. From ebe33362a84dcbec201500088c1ccfccb65e89cb Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 22 Nov 2021 06:01:53 -0500 Subject: [PATCH 5/5] parquet-tools: fix tests for arrow-cpp 6.0.1 --- pkgs/tools/misc/parquet-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 0ba909e1f602..46155dcb3323 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -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" '';