diff options
| author | Phillip Cloud <417981+cpcloud@users.noreply.github.com> | 2021-10-31 18:59:57 -0400 |
|---|---|---|
| committer | Phillip Cloud <417981+cpcloud@users.noreply.github.com> | 2021-11-04 09:07:25 -0400 |
| commit | d96ab39a64fc01274022f00a9bcae3c2c195a3d3 (patch) | |
| tree | 1a2708ee24cd9a1d70062dfcdbb1688b42783317 /pkgs/development/libraries/arrow-cpp | |
| parent | 56cccec572cc5af6f910210bb1c28b3974cb5606 (diff) | |
| download | nixpkgs-d96ab39a64fc01274022f00a9bcae3c2c195a3d3.tar nixpkgs-d96ab39a64fc01274022f00a9bcae3c2c195a3d3.tar.gz nixpkgs-d96ab39a64fc01274022f00a9bcae3c2c195a3d3.tar.bz2 nixpkgs-d96ab39a64fc01274022f00a9bcae3c2c195a3d3.tar.lz nixpkgs-d96ab39a64fc01274022f00a9bcae3c2c195a3d3.tar.xz nixpkgs-d96ab39a64fc01274022f00a9bcae3c2c195a3d3.tar.zst nixpkgs-d96ab39a64fc01274022f00a9bcae3c2c195a3d3.zip | |
arrow-cpp: refactor source fetching
Diffstat (limited to 'pkgs/development/libraries/arrow-cpp')
| -rw-r--r-- | pkgs/development/libraries/arrow-cpp/default.nix | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index fe06a64bcf5..db9e5be6f2e 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, tzdata , utf8proc, which +, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, jemalloc +, lz4, perl, python3, rapidjson, re2, snappy, thrift, tzdata , utf8proc, which , zlib, zstd , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -31,22 +31,23 @@ in stdenv.mkDerivation rec { }; sourceRoot = "apache-arrow-${version}/cpp"; - ARROW_JEMALLOC_URL = fetchurl { + ARROW_JEMALLOC_URL = jemalloc.src; + + ARROW_MIMALLOC_URL = fetchFromGitHub { # From # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt - url = - "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; - hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; + owner = "microsoft"; + repo = "mimalloc"; + rev = "v1.7.2"; + hash = "sha256-yHupYFgC8mJuLUSpuEAfwF7l6Ue4EiuO1Q4qN4T6wWc="; }; - ARROW_MIMALLOC_URL = fetchurl { - # From - # ./cpp/cmake_modules/ThirdpartyToolchain.cmake - # ./cpp/thirdparty/versions.txt - url = - "https://github.com/microsoft/mimalloc/archive/v1.7.2.tar.gz"; - hash = "sha256-sZEuNUVlpLaYQQ91g8D4OTSm27Ot5Uq33csVaTIJNr0="; + ARROW_XSIMD_URL = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xsimd"; + rev = "aeec9c872c8b475dedd7781336710f2dd2666cb2"; + hash = "sha256-vWKdJkieKhaxyAJhijXUmD7NmNvMWd79PskQojulA1w="; }; patches = [ @@ -119,11 +120,6 @@ 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 = fetchurl { - url = "https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz"; - sha256 = "09kvl962c6b0wnb7pb2n9dhvkflzwalgq6gwwi8628fgi9n1x10a"; - }; - doInstallCheck = true; ARROW_TEST_DATA = if doInstallCheck then "${arrow-testing}/data" else null; |