jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #70584 from tobim/pkgs/arrow-cpp

Browse Source 
arrow-cpp: 0.14.1 -> 0.15.0
This commit is contained in:
Dmitry Kalinkin 2019-10-08 18:38:29 -04:00 committed by GitHub
commit 702f58f9e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost
, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl
, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
let
parquet-testing = fetchFromGitHub {
@ -7,15 +9,15 @@ let
rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df";
sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq";
};
in
stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
pname = "arrow-cpp";
version = "0.14.1";
version = "0.15.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "0a0xrsbr7dd1yp34yw82jw7psfkfvm935jhd5mam32vrsjvdsj4r";
url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "0n7xrn5490r2snjl45pm2a4pr2x8a29sh8mpyi4nj5pr9f62s1yi";
};
sourceRoot = "apache-arrow-${version}/cpp";
@ -24,57 +26,81 @@ stdenv.mkDerivation rec {
# From
# ./cpp/cmake_modules/ThirdpartyToolchain.cmake
# ./cpp/thirdparty/versions.txt
url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2";
url =
"https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2";
sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl";
};
patches = [
# patch to fix python-test
./darwin.patch
];
];
nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [
cmake
autoconf # for vendored jemalloc
flatbuffers
] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [
boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson
snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy
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/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
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 = [
"-DARROW_BUILD_TESTS=ON"
"-DARROW_DEPENDENCY_SOURCE=SYSTEM"
"-DARROW_PARQUET=ON"
"-DARROW_PLASMA=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;
PARQUET_TEST_DATA =
if doInstallCheck then "${parquet-testing}/data" else null;
installCheckInputs = [ perl which ];
installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
for f in release/*test; do
for f in release/*test{,s}; do
install_name_tool -add_rpath "$out"/lib "$f"
done
'') + ''
ctest -L unittest -V
'';
'')
+ (let
excludedTests = stdenv.lib.optionals stdenv.isDarwin [
# Some plasma tests need to be patched to use a shorter AF_UNIX socket
# path on Darwin. See https://github.com/NixOS/nix/pull/1085
"plasma-external-store-tests"
"plasma-client-tests"
];
in ''
ctest -L unittest -V \
--exclude-regex '(${builtins.concatStringsSep "|" excludedTests})'
'');
meta = {
description = "A cross-language development platform for in-memory data";
homepage = https://arrow.apache.org/;
homepage = "https://arrow.apache.org/";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
maintainers = with stdenv.lib.maintainers; [ tobim veprbl ];
};
}

4
pkgs/development/python-modules/awkward/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "0.12.12";
version = "0.12.13";
src = fetchPypi {
inherit pname version;
sha256 = "316abd04dd049d56567082670ae8800c265dc3f06b699cf2a953ea6aea7696ce";
sha256 = "0jciasfmayk3xs8lprrdjd6brvy614yd2ngpgyzlszis5sa6nr18";
};
nativeBuildInputs = [ pytestrunner ];