diff options
Diffstat (limited to 'pkgs/by-name/ar/arrow-cpp/package.nix')
| -rw-r--r-- | pkgs/by-name/ar/arrow-cpp/package.nix | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 1abfe6f3b701..81b230d09179 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -35,6 +35,7 @@ nlohmann_json, openssl, perl, + pkg-config, protobuf, python3, rapidjson, @@ -49,14 +50,14 @@ zstd, testers, enableShared ? !stdenv.hostPlatform.isStatic, - enableFlight ? true, - enableJemalloc ? !stdenv.isDarwin, + enableFlight ? stdenv.buildPlatform == stdenv.hostPlatform, + enableJemalloc ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64, enableS3 ? true, - enableGcs ? !stdenv.isDarwin, + enableGcs ? !stdenv.hostPlatform.isDarwin, }: assert lib.asserts.assertMsg ( - (enableS3 && stdenv.isDarwin) + (enableS3 && stdenv.hostPlatform.isDarwin) -> (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70") ) "S3 on Darwin requires Boost != 1.69"; @@ -65,28 +66,29 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "735ae7128d571398dd798d7ff004adebeb342883"; - hash = "sha256-67KwnSt+EeEDvk+9kxR51tErL2wJqEPRITKb/dN+HMQ="; + rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; + hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "74278bc4a1122d74945969e6dec405abd1533ec3"; - hash = "sha256-WbpndtAviph6+I/F2bevuMI9DkfSv4SMPgMaP98k6Qo="; + rev = "a7f1d288e693dbb08e3199851c4eb2140ff8dff2"; + hash = "sha256-zLWJOWcW7OYL32OwBm9VFtHbmG+ibhteRfHlKr9G3CQ="; }; + version = "18.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; - version = "17.0.0"; + inherit version; src = fetchFromGitHub { owner = "apache"; repo = "arrow"; - rev = "apache-arrow-17.0.0"; - hash = "sha256-ZQqi1RFb4Ey0A0UVCThuIxM7DoFfkLwaeRAc2z8u9so="; + rev = "apache-arrow-${version}"; + hash = "sha256-V2lOYOUJwXSvPPk2G17uc1eZO88EATHKwwDnEroBrPw="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; @@ -125,10 +127,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ninja autoconf # for vendored jemalloc flatbuffers - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost @@ -171,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' patchShebangs build-support/ substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \ - --replace 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' + --replace-fail 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' ''; cmakeFlags = @@ -179,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" - "-DARROW_BUILD_TESTS=ON" + "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_INTEGRATION=ON" "-DARROW_BUILD_UTILITIES=ON" "-DARROW_EXTRA_ERROR_CONTEXT=ON" @@ -218,10 +221,10 @@ stdenv.mkDerivation (finalAttrs: { "-DPARQUET_REQUIRE_ENCRYPTION=ON" ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] - ++ lib.optionals (!stdenv.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] ++ lib.optionals enableS3 [ "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ]; @@ -247,7 +250,7 @@ stdenv.mkDerivation (finalAttrs: { "TestS3FS.*" "TestS3FSGeneric.*" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # TODO: revisit at 12.0.0 or when # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 # is available, see |