cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

arrow-cpp: 1.0.1 -> 2.0.0

Browse source
This commit is contained in:
Tobias Mayer 2020-10-22 14:03:46 +02:00
parent cfed29bfcb
commit 7cb0d9d37e
No known key found for this signature in database
GPG key ID: F8657E90819A1298
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/development/libraries/arrow-cpp/default.nix
View file

@ -7,25 +7,25 @@ let
arrow-testing = fetchFromGitHub { arrow-testing = fetchFromGitHub {
owner = "apache"; owner = "apache";
repo = "arrow-testing"; repo = "arrow-testing";
rev = "f552c4dcd2ae3d14048abd20919748cce5276ade"; rev = "860376d4e586a3ac34ec93089889da624ead6c2a";
sha256 = "1smaidk5k2q6xdav7qp74ak34vvwv5qyfqw0szi573awsrsrahr8"; sha256 = "16k3lz4ji4y3qcjhr765q14jwwlac8iqscwndwd8ll3zr0vy69b0";
}; };
parquet-testing = fetchFromGitHub { parquet-testing = fetchFromGitHub {
owner = "apache"; owner = "apache";
repo = "parquet-testing"; repo = "parquet-testing";
rev = "bcd9ebcf9204a346df47204fe21b85c8d0498816"; rev = "d914f9d289488c7db1759d7a88a4a1b8f062c7dd";
sha256 = "0m16pqzbvxiaradq088q5ai6fwnz9srbap996397znwppvva479b"; sha256 = "0xj3ynck2wv6l70xnmvs13bz1jycqjrl5k4lwhhwgag338048als";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "arrow-cpp"; pname = "arrow-cpp";
version = "1.0.1"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "0p67dni8dwqbwq96gfdq3pyk799id6dgdl9h7cpp9icsjsmad70l"; sha256 = "1ghzqw0rx4rxa2d7i76y3szisv0bd9cl7vzadbc41cvvhk6440xy";
}; };
sourceRoot = "apache-arrow-${version}/cpp"; sourceRoot = "apache-arrow-${version}/cpp";
@ -43,26 +43,13 @@ in stdenv.mkDerivation rec {
# ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/cmake_modules/ThirdpartyToolchain.cmake
# ./cpp/thirdparty/versions.txt # ./cpp/thirdparty/versions.txt
url = url =
"https://github.com/microsoft/mimalloc/archive/v1.6.3.tar.gz"; "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz";
sha256 = "0pia8b4acv1w8qzcpc9i1a2fasnn3rmp996k0l87p2di0lbls0w5"; sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs";
}; };
patches = [ patches = [
# patch to fix python-test # patch to fix python-test
./darwin.patch ./darwin.patch
# Properly exported static targets. Remove at the next version bump.
(fetchpatch {
url = "https://github.com/apache/arrow/commit/b040600b39a4f803b704934252665f9440dd1276.patch";
sha256 = "1mvw29ybcsz77zprmsk41blxmrj8ywayg7ghf6xkkf98907ws8m8";
includes = [ "*.cmake" ];
stripLen = 1;
})
(fetchpatch {
url = "https://github.com/apache/arrow/commit/81d3f2657b17436d6d5a6af9aaf6f36c3f5e4ac9.patch";
sha256 = "18fmzr5f79hvx2qpyfgvvl98p4zgzfxrmrd1d2basp0w0da1ciqs";
includes = [ "*CMakeLists.txt" "*.cmake" "*.cmake.in" ];
stripLen = 1;
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [