Skip to content

Commit

Permalink
Merge pull request #94849 from tobim/pkgs/arrow-cpp-1.0
Browse files Browse the repository at this point in the history
arrow-cpp: 0.17.1 -> 1.0.0
  • Loading branch information
veprbl committed Aug 21, 2020
2 parents 6f41415 + 9e0b75e commit cf7a15a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 38 deletions.
62 changes: 37 additions & 25 deletions pkgs/development/libraries/arrow-cpp/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost
, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl
, python3, rapidjson, snappy, thrift, which, zlib, zstd
{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames
, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4
, perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd
, enableShared ? true }:

let
arrow-testing = fetchFromGitHub {
owner = "apache";
repo = "arrow-testing";
rev = "f552c4dcd2ae3d14048abd20919748cce5276ade";
sha256 = "1smaidk5k2q6xdav7qp74ak34vvwv5qyfqw0szi573awsrsrahr8";
};

parquet-testing = fetchFromGitHub {
owner = "apache";
repo = "parquet-testing";
Expand All @@ -13,14 +20,13 @@ let

in stdenv.mkDerivation rec {
pname = "arrow-cpp";
version = "0.17.1";
version = "1.0.0";

src = fetchurl {
url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "18lyvbibfdw3w77cy5whbq7c6mshn5fg2bhvgw7v226a7cs1rifb";
sha256 = "0hzjrhr4brqpmy9f8fbj9p5a482ya8kjhkycz6maa0w2nkzbkpc6";
};

sourceRoot = "apache-arrow-${version}/cpp";

ARROW_JEMALLOC_URL = fetchurl {
Expand All @@ -32,26 +38,31 @@ in stdenv.mkDerivation rec {
sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl";
};

ARROW_MIMALLOC_URL = fetchurl {
# From
# ./cpp/cmake_modules/ThirdpartyToolchain.cmake
# ./cpp/thirdparty/versions.txt
url =
"https://github.com/microsoft/mimalloc/archive/v1.6.3.tar.gz";
sha256 = "0pia8b4acv1w8qzcpc9i1a2fasnn3rmp996k0l87p2di0lbls0w5";
};

patches = [
# patch to fix python-test
./darwin.patch

# fix musl build
# Properly exported static targets. Remove at the next version bump.
(fetchpatch {
url = "https://github.com/apache/arrow/commit/de4168786dfd8ab932f48801e0a7a6b8a370c19d.diff";
sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y";
url = "https://github.com/apache/arrow/commit/b040600b39a4f803b704934252665f9440dd1276.patch";
sha256 = "1mvw29ybcsz77zprmsk41blxmrj8ywayg7ghf6xkkf98907ws8m8";
includes = [ "*.cmake" ];
stripLen = 1;
})

# fix build for "ZSTD_SOURCE=SYSTEM"
(fetchpatch {
url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff";
sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb";
url = "https://github.com/apache/arrow/commit/81d3f2657b17436d6d5a6af9aaf6f36c3f5e4ac9.patch";
sha256 = "18fmzr5f79hvx2qpyfgvvl98p4zgzfxrmrd1d2basp0w0da1ciqs";
includes = [ "*CMakeLists.txt" "*.cmake" "*.cmake.in" ];
stripLen = 1;
})
] ++ lib.optionals (!enableShared) [
# The shared jemalloc lib is unused and breaks in static mode due to missing -fpic.
./jemalloc-disable-shared.patch
];

nativeBuildInputs = [
Expand All @@ -70,6 +81,7 @@ in stdenv.mkDerivation rec {
rapidjson
snappy
thrift
utf8proc
zlib
zstd
] ++ lib.optionals enableShared [
Expand All @@ -78,41 +90,41 @@ in stdenv.mkDerivation rec {
];

preConfigure = ''
substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
patchShebangs build-support/
'';

cmakeFlags = [
"-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_VERBOSE_THIRDPARTY_BUILD=ON"
"-DARROW_DEPENDENCY_SOURCE=SYSTEM"
"-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
"-DARROW_PLASMA=ON"
# Disable Python for static mode because openblas is currently broken there.
"-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}"
"-DARROW_USE_GLOG=ON"
"-DARROW_WITH_BROTLI=ON"
"-DARROW_WITH_LZ4=ON"
"-DARROW_WITH_SNAPPY=ON"
"-DARROW_WITH_UTF8PROC=ON"
"-DARROW_WITH_ZLIB=ON"
"-DARROW_WITH_ZSTD=ON"
"-DARROW_ZSTD_USE_SHARED=${if enableShared then "ON" else "OFF"}"
"-DARROW_MIMALLOC=ON"
# Parquet options:
"-DARROW_PARQUET=ON"
"-DPARQUET_BUILD_EXECUTABLES=ON"
] ++ lib.optionals (!enableShared) [
"-DARROW_BUILD_SHARED=OFF"
"-DARROW_BOOST_USE_SHARED=OFF"
"-DARROW_GFLAGS_USE_SHARED=OFF"
"-DARROW_PROTOBUF_USE_SHARED=OFF"
"-DARROW_TEST_LINKAGE=static"
"-DOPENSSL_USE_STATIC_LIBS=ON"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests
"-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";

doInstallCheck = true;
ARROW_TEST_DATA =
if doInstallCheck then "${arrow-testing}/data" else null;
PARQUET_TEST_DATA =
if doInstallCheck then "${parquet-testing}/data" else null;
installCheckInputs = [ perl which ];
Expand Down
11 changes: 0 additions & 11 deletions pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch

This file was deleted.

8 changes: 6 additions & 2 deletions pkgs/development/libraries/utf8proc/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, cmake }:

stdenv.mkDerivation rec {
pname = "utf8proc";
Expand All @@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq";
};

makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ cmake ];

cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
];

meta = with stdenv.lib; {
description = "A clean C library for processing UTF-8 Unicode data";
Expand Down

0 comments on commit cf7a15a

Please sign in to comment.