diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7f3896f41be5..fe06a64bcf56 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 -, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, xsimd +, perl, python3, rapidjson, re2, snappy, thrift, tzdata , utf8proc, which , zlib, zstd , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -9,25 +9,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "6d98243093c0b36442da94de7010f3eacc2a9909"; - hash = "sha256-n57Fuz2k6sX1o3vYBmC41eRKGnyt9+YL5r3WTHHRRzw="; + rev = "a60b715263d9bbf7e744527fb0c084b693f58043"; + hash = "sha256-Dz1dCV0m5Y24qzXdVaqrZ7hK3MRSb4GF0PXrjMAsjZU="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "ddd898958803cb89b7156c6350584d1cda0fe8de"; - hash = "sha256-gK04mj1Fuhkf82NDMrXplFa+cr/3Ij7I9VnYfinuJlg="; + rev = "d4d485956a643c693b5549e1a62d52ca61c170f1"; + hash = "sha256-GmOAS8gGhzDI0WzORMkWHRRUl/XBwmNen2d3VefZxxc="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-w7QxPspZTCD3Yag2cZchqvB2AAGviWuuw6tkQg/5kQo="; + hash = "sha256-adJo+egtPr71la0b3IPUywKyDBgZRqaGMfZkXXwfepA="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { preConfigure = '' patchShebangs build-support/ + substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; cmakeFlags = [ @@ -117,7 +119,10 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; - ARROW_XSIMD_URL = xsimd.src; + ARROW_XSIMD_URL = fetchurl { + url = "https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz"; + sha256 = "09kvl962c6b0wnb7pb2n9dhvkflzwalgq6gwwi8628fgi9n1x10a"; + }; doInstallCheck = true; ARROW_TEST_DATA = @@ -148,10 +153,10 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A cross-language development platform for in-memory data"; + description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ tobim veprbl ]; + maintainers = with maintainers; [ tobim veprbl cpcloud ]; }; }