diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2024-02-14 08:06:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-14 08:06:35 -0500 |
commit | b018a19eafd5f4862c0f6c3e0292276a6effcc0c (patch) | |
tree | ec33fb1d17b7578662ea14d1477262009d2c03a1 | |
parent | 2660301b374fb8434435adf416f467adea92fdc5 (diff) | |
parent | 01a39263ffc37b9d49f715de76b6248e93c2cb06 (diff) |
Merge pull request #288076 from tobim/pkgs/arrow-cpp-cleanups
arrow-cpp: various improvements Fixes #284878
-rw-r--r-- | pkgs/by-name/ar/arrow-cpp/package.nix (renamed from pkgs/development/libraries/arrow-cpp/default.nix) | 43 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 32 insertions, 13 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 174d5aa827f98..23a2432c824ee 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -5,8 +5,19 @@ , fixDarwinDylibNames , autoconf , aws-sdk-cpp +, aws-sdk-cpp-arrow ? aws-sdk-cpp.override { + apis = [ + "cognito-identity" + "config" + "identity-management" + "s3" + "sts" + "transfer" + ]; + } , boost , brotli +, bzip2 , c-ares , cmake , crc32c @@ -36,6 +47,7 @@ , which , zlib , zstd +, testers , enableShared ? !stdenv.hostPlatform.isStatic , enableFlight ? true , enableJemalloc ? !stdenv.isDarwin @@ -64,17 +76,6 @@ let hash = "sha256-CUckfNjfDW05crWigzMP5b9UynviXKGZUlIr754OoGU="; }; - aws-sdk-cpp-arrow = aws-sdk-cpp.override { - apis = [ - "cognito-identity" - "config" - "identity-management" - "s3" - "sts" - "transfer" - ]; - }; - in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -128,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost brotli + bzip2 flatbuffers gflags glog @@ -187,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: { "-DARROW_USE_GLOG=ON" "-DARROW_WITH_BACKTRACE=ON" "-DARROW_WITH_BROTLI=ON" + "-DARROW_WITH_BZ2=ON" "-DARROW_WITH_LZ4=ON" "-DARROW_WITH_NLOHMANN_JSON=ON" "-DARROW_WITH_SNAPPY=ON" @@ -247,6 +250,8 @@ stdenv.mkDerivation (finalAttrs: { installCheckPhase = let disabledTests = [ + # flaky + "arrow-flight-test" # requires networking "arrow-gcsfs-test" "arrow-flight-integration-test" @@ -266,8 +271,24 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; + pkgConfigModules = [ + "arrow" + "arrow-acero" + "arrow-compute" + "arrow-csv" + "arrow-dataset" + "arrow-filesystem" + "arrow-flight" + "arrow-flight-sql" + "arrow-flight-testing" + "arrow-json" + "arrow-substrait" + "arrow-testing" + "parquet" + ]; }; passthru = { inherit enableFlight enableJemalloc enableS3 enableGcs; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7b70a38b99c3..0c74b39af6e60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20449,8 +20449,6 @@ with pkgs; cudaPackages = cudaPackages_12; }; - arrow-cpp = callPackage ../development/libraries/arrow-cpp { }; - arrow-glib = callPackage ../development/libraries/arrow-glib { }; arsenal = callPackage ../tools/security/arsenal { }; |