arrow-cpp: 11.0.0 -> 12.0.0
This commit is contained in:
parent
5130c4f4ef
commit
6dc7093484
|
@ -55,16 +55,16 @@ let
|
||||||
name = "arrow-testing";
|
name = "arrow-testing";
|
||||||
owner = "apache";
|
owner = "apache";
|
||||||
repo = "arrow-testing";
|
repo = "arrow-testing";
|
||||||
rev = "ecab1162cbec872e17d949ecc86181670aee045c";
|
rev = "47f7b56b25683202c1fd957668e13f2abafc0f12";
|
||||||
hash = "sha256-w6rEuxfLTEO8DyXV44G6JOMeTfYtskFCOj9rHXNmj2Y=";
|
hash = "sha256-ZDznR+yi0hm5O1s9as8zq5nh1QxJ8kXCRwbNQlzXpnI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
parquet-testing = fetchFromGitHub {
|
parquet-testing = fetchFromGitHub {
|
||||||
name = "parquet-testing";
|
name = "parquet-testing";
|
||||||
owner = "apache";
|
owner = "apache";
|
||||||
repo = "parquet-testing";
|
repo = "parquet-testing";
|
||||||
rev = "5b82793ef7196f7b3583e85669ced211cd8b5ff2";
|
rev = "b2e7cc755159196e3a068c8594f7acbaecfdaaac";
|
||||||
hash = "sha256-gcOvk7qFHZgJWE9CpucC8zwayYw47VbC3lmSRu4JQFg=";
|
hash = "sha256-IFvGTOkaRSNgZOj8DziRj88yH5JRF+wgSDZ5N0GNvjk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
aws-sdk-cpp-arrow = aws-sdk-cpp.override {
|
aws-sdk-cpp-arrow = aws-sdk-cpp.override {
|
||||||
|
@ -81,12 +81,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "arrow-cpp";
|
pname = "arrow-cpp";
|
||||||
version = "11.0.0";
|
version = "12.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
||||||
hash = "sha256-Ldjw6ghIpYeFYo7jpXZ1VI1QnhchOi9dcrDZALQ/VDA=";
|
hash = "sha256-3dg0eIJ3XlOvfQlloZArfY/NCgMP0U94PU+F6CE1LVI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "apache-arrow-${version}/cpp";
|
sourceRoot = "apache-arrow-${version}/cpp";
|
||||||
|
|
||||||
# versions are all taken from
|
# versions are all taken from
|
||||||
|
|
|
@ -85,15 +85,6 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
__darwinAllowLocalNetworking = true;
|
__darwinAllowLocalNetworking = true;
|
||||||
|
|
||||||
# fix on current master
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/apache/arrow/commit/bce43175aa8cfb4534d3efbcc092f697f25f0f5a.patch";
|
|
||||||
hash = "sha256-naOAQjQgSKIoCAGCKr7N4dCkOMtweAdfggGOQKDY3k0=";
|
|
||||||
stripLen = 1;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
export PYARROW_PARALLEL=$NIX_BUILD_CORES
|
export PYARROW_PARALLEL=$NIX_BUILD_CORES
|
||||||
'';
|
'';
|
||||||
|
@ -106,6 +97,9 @@ buildPythonPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pytestFlagsArray = [
|
pytestFlagsArray = [
|
||||||
|
# A couple of tests are missing fixture imports, luckily pytest offers a
|
||||||
|
# clean solution.
|
||||||
|
"--fixtures pyarrow/tests/conftest.py"
|
||||||
# Deselect a single test because pyarrow prints a 2-line error message where
|
# Deselect a single test because pyarrow prints a 2-line error message where
|
||||||
# only a single line is expected. The additional line of output comes from
|
# only a single line is expected. The additional line of output comes from
|
||||||
# the glog library which is an optional dependency of arrow-cpp that is
|
# the glog library which is an optional dependency of arrow-cpp that is
|
||||||
|
|
Loading…
Reference in a new issue