git.iko.soy/typeable/nixpkgs
on master help sign in
arrow-cpp: 2.0.0 -> 3.0.0
commitc0449e4f2f254059946859b0e47baa5a5c8f2f4b authorTobias Mayer <tobim@fastmail.fm> dateTue 26 Jan 2021, 17:35 (6 years ago) parent9ce1caa
2 files changed+24−7
pkgs/development/libraries/arrow-cpp/default.nix+17−7 pkgs/development/python-modules/pyarrow/default.nix+7
pkgs/development/libraries/arrow-cpp/default.nix+17−7
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames
22, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4
3−, perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd
3+, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, zlib, zstd
44, enableShared ? !stdenv.hostPlatform.isStatic
55}:
66
@@ -8,25 +8,25 @@ let
88 arrow-testing = fetchFromGitHub {
99 owner = "apache";
1010 repo = "arrow-testing";
11− rev = "860376d4e586a3ac34ec93089889da624ead6c2a";
12− sha256 = "16k3lz4ji4y3qcjhr765q14jwwlac8iqscwndwd8ll3zr0vy69b0";
11+ rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235";
12+ sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i";
1313 };
1414
1515 parquet-testing = fetchFromGitHub {
1616 owner = "apache";
1717 repo = "parquet-testing";
18− rev = "d914f9d289488c7db1759d7a88a4a1b8f062c7dd";
19− sha256 = "0xj3ynck2wv6l70xnmvs13bz1jycqjrl5k4lwhhwgag338048als";
18+ rev = "e31fe1a02c9e9f271e4bfb8002d403c52f1ef8eb";
19+ sha256 = "02f51dvx8w5mw0bx3hn70hkn55mn1m65kzdps1ifvga9hghpy0sh";
2020 };
2121
2222in stdenv.mkDerivation rec {
2323 pname = "arrow-cpp";
24− version = "2.0.0";
24+ version = "3.0.0";
2525
2626 src = fetchurl {
2727 url =
2828 "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
29− sha256 = "1ghzqw0rx4rxa2d7i76y3szisv0bd9cl7vzadbc41cvvhk6440xy";
29+ sha256 = "0yp2b02wrc3s50zd56fmpz4nhhbihp0zw329v4zizaipwlxwrhkk";
3030 };
3131 sourceRoot = "apache-arrow-${version}/cpp";
3232
@@ -67,6 +67,7 @@ in stdenv.mkDerivation rec {
6767 gtest
6868 lz4
6969 rapidjson
70+ re2
7071 snappy
7172 thrift
7273 utf8proc
@@ -115,6 +116,15 @@ in stdenv.mkDerivation rec {
115116 if doInstallCheck then "${arrow-testing}/data" else null;
116117 PARQUET_TEST_DATA =
117118 if doInstallCheck then "${parquet-testing}/data" else null;
119+ GTEST_FILTER =
120+ if doInstallCheck then let
121+ # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11398
122+ filteredTests = lib.optionals stdenv.hostPlatform.isAarch64 [
123+ "TestFilterKernelWithNumeric/3.CompareArrayAndFilterRandomNumeric"
124+ "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric"
125+ "TestCompareKernel.PrimitiveRandomTests"
126+ ];
127+ in "-${builtins.concatStringsSep ":" filteredTests}" else null;
118128 installCheckInputs = [ perl which ];
119129 installCheckPhase =
120130 let
pkgs/development/python-modules/pyarrow/default.nix+7
@@ -34,6 +34,13 @@ buildPythonPackage rec {
3434 export PYARROW_PARALLEL=$NIX_BUILD_CORES
3535 '';
3636
37+ # Deselect a single test because pyarrow prints a 2-line error message where
38+ # only a single line is expected. The additional line of output comes from
39+ # the glog library which is an optional dependency of arrow-cpp that is
40+ # enabled in nixpkgs.
41+ # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
42+ pytestFlagsArray = [ "--deselect=pyarrow/tests/test_memory.py::test_env_var" ];
43+
3744 dontUseSetuptoolsCheck = true;
3845 preCheck = ''
3946 mv pyarrow/tests tests