From a79fa1af4897d088783e705c1f4bb50ef232faf1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 5 Apr 2019 19:07:15 -0400 Subject: [PATCH 1/4] snappy: fix include path in generated cmake target --- pkgs/development/libraries/snappy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 32c93b192ef..36077d71126 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + postInstall = '' + substituteInPlace "$out"/lib/cmake/Snappy/SnappyTargets.cmake \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' + ''; + checkTarget = "test"; doCheck = true; From b99dc87dc214fc450f1f03769f4fd3802e4c3edf Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 5 Apr 2019 19:08:22 -0400 Subject: [PATCH 2/4] arrow-cpp: 0.12.0 -> 0.13.0 pythonPackages.pyarrow: 0.12.0 -> 0.13.0 *_HOME variables are now gone. There are similar *_ROOT variables, but the package discovery currently works without that. --- .../libraries/arrow-cpp/default.nix | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index cff960b29a7..a5f05482dff 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,21 +1,28 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "46ae2605c2de306f5740587107dcf333a527f2d1"; - sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik"; + rev = "8991d0b58d5a59925c87dd2a0bdb59a5a4a16bd4"; + sha256 = "00js5d1s98y3ianrvh1ggrd157yfmia4g55jx9xmfcz4a8mcbawx"; + }; + + # Enable non-bundled uriparser + # Introduced in https://github.com/apache/arrow/pull/4092 + Finduriparser_cmake = fetchurl { + url = https://raw.githubusercontent.com/apache/arrow/af4f52961209a5f1b43a19483536285c957e3bed/cpp/cmake_modules/Finduriparser.cmake; + sha256 = "1cylrw00n2nkc2c49xk9j3rrza351rpravxgpw047vimcw0sk93s"; }; in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil"; + sha256 = "06irh5zx6lc7jjf6hpz1vzk0pvbdx08lcirc8cp8ksb8j7fpfamc"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -26,35 +33,25 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; - buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; + buildInputs = [ + boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson + snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy + ]; preConfigure = '' - substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + + cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake patchShebangs build-support/ ''; - BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; }; - DOUBLE_CONVERSION_HOME = double-conversion; - FLATBUFFERS_HOME = flatbuffers; - GFLAGS_HOME = gflags; - GLOG_HOME = glog; - GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest gtest.dev ]; }; - LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; - RAPIDJSON_HOME = rapidjson; - SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; - THRIFT_HOME = thrift; - ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; }; - ZSTD_HOME = zstd; - cmakeFlags = [ "-DARROW_BUILD_TESTS=ON" - "-DARROW_PYTHON=ON" + "-DARROW_DEPENDENCY_SOURCE=SYSTEM" "-DARROW_PARQUET=ON" + "-DARROW_PYTHON=ON" + "-Duriparser_SOURCE=SYSTEM" ]; doInstallCheck = true; From 45da66351c330b403aae8bd66a2e4c30de87abb6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 6 Apr 2019 12:27:37 -0400 Subject: [PATCH 3/4] uriparser: enable build on darwin --- pkgs/development/libraries/uriparser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index a4f99b942ea..89efdc006a5 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { API documentation is available on uriparser website. ''; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bosu ]; }; } From 43c7477345774db80d34f61a86e597bb89a0ac19 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2019 00:20:08 -0400 Subject: [PATCH 4/4] arrow-cpp: fix build on architectures other than x86_64 Settting ARROW_USE_SIMD=OFF used to fix i686 build for 1.12.0. The fix for ARROW-5007 should help on aarch64. --- pkgs/development/libraries/arrow-cpp/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a5f05482dff..7f7ef3336a4 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake patchShebangs build-support/ + + # Fix build for ARROW_USE_SIMD=OFF + # https://jira.apache.org/jira/browse/ARROW-5007 + sed -i src/arrow/util/sse-util.h -e '1i#include "arrow/util/logging.h"' + sed -i src/arrow/util/neon-util.h -e '1i#include "arrow/util/logging.h"' ''; cmakeFlags = [ @@ -52,7 +57,7 @@ stdenv.mkDerivation rec { "-DARROW_PARQUET=ON" "-DARROW_PYTHON=ON" "-Duriparser_SOURCE=SYSTEM" - ]; + ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null;