@@ -1,21 +1,28 @@
1−{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
1+{ stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
22
33let
44 parquet-testing = fetchFromGitHub {
55 owner = "apache";
66 repo = "parquet-testing";
7− rev = "46ae2605c2de306f5740587107dcf333a527f2d1";
8− sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik";
7+ rev = "8991d0b58d5a59925c87dd2a0bdb59a5a4a16bd4";
8+ sha256 = "00js5d1s98y3ianrvh1ggrd157yfmia4g55jx9xmfcz4a8mcbawx";
9+ };
10+
11+ # Enable non-bundled uriparser
12+ # Introduced in https://github.com/apache/arrow/pull/4092
13+ Finduriparser_cmake = fetchurl {
14+ url = https://raw.githubusercontent.com/apache/arrow/af4f52961209a5f1b43a19483536285c957e3bed/cpp/cmake_modules/Finduriparser.cmake;
15+ sha256 = "1cylrw00n2nkc2c49xk9j3rrza351rpravxgpw047vimcw0sk93s";
916 };
1017in
1118
1219stdenv.mkDerivation rec {
1320 name = "arrow-cpp-${version}";
14− version = "0.12.0";
21+ version = "0.13.0";
1522
1623 src = fetchurl {
1724 url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
18− sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil";
25+ sha256 = "06irh5zx6lc7jjf6hpz1vzk0pvbdx08lcirc8cp8ksb8j7fpfamc";
1926 };
2027
2128 sourceRoot = "apache-arrow-${version}/cpp";
@@ -26,35 +33,25 @@ stdenv.mkDerivation rec {
2633 ];
2734
2835 nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ];
29− buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ];
36+ buildInputs = [
37+ boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson
38+ snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy
39+ ];
3040
3141 preConfigure = ''
32− substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
33− substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
34− substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
3542 substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
36− substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
43+
44+ cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake
3745
3846 patchShebangs build-support/
3947 '';
4048
41− BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; };
42− DOUBLE_CONVERSION_HOME = double-conversion;
43− FLATBUFFERS_HOME = flatbuffers;
44− GFLAGS_HOME = gflags;
45− GLOG_HOME = glog;
46− GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest gtest.dev ]; };
47− LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; };
48− RAPIDJSON_HOME = rapidjson;
49− SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };
50− THRIFT_HOME = thrift;
51− ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; };
52− ZSTD_HOME = zstd;
53−
5449 cmakeFlags = [
5550 "-DARROW_BUILD_TESTS=ON"
56− "-DARROW_PYTHON=ON"
51+ "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
5752 "-DARROW_PARQUET=ON"
53+ "-DARROW_PYTHON=ON"
54+ "-Duriparser_SOURCE=SYSTEM"
5855 ];
5956
6057 doInstallCheck = true;