diff options
| author | Tobias Mayer <tobim@fastmail.fm> | 2023-04-23 20:35:10 +0200 |
|---|---|---|
| committer | Tobias Mayer <tobim@fastmail.fm> | 2023-05-01 21:56:12 +0200 |
| commit | 6dc70934843dc99cace63d0ab69e23fe86a172ca (patch) | |
| tree | 65b70f9d00ce9c584ca24187b69d6b1435037854 | |
| parent | 5130c4f4ef66b1cf34d63220bdd1cc8f20de6515 (diff) | |
| download | nixpkgs-6dc70934843dc99cace63d0ab69e23fe86a172ca.tar nixpkgs-6dc70934843dc99cace63d0ab69e23fe86a172ca.tar.gz nixpkgs-6dc70934843dc99cace63d0ab69e23fe86a172ca.tar.bz2 nixpkgs-6dc70934843dc99cace63d0ab69e23fe86a172ca.tar.lz nixpkgs-6dc70934843dc99cace63d0ab69e23fe86a172ca.tar.xz nixpkgs-6dc70934843dc99cace63d0ab69e23fe86a172ca.tar.zst nixpkgs-6dc70934843dc99cace63d0ab69e23fe86a172ca.zip | |
arrow-cpp: 11.0.0 -> 12.0.0
| -rw-r--r-- | pkgs/development/libraries/arrow-cpp/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyarrow/default.nix | 12 |
2 files changed, 10 insertions, 15 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 95f94b37135..02f21ca5ef4 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -55,16 +55,16 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "ecab1162cbec872e17d949ecc86181670aee045c"; - hash = "sha256-w6rEuxfLTEO8DyXV44G6JOMeTfYtskFCOj9rHXNmj2Y="; + rev = "47f7b56b25683202c1fd957668e13f2abafc0f12"; + hash = "sha256-ZDznR+yi0hm5O1s9as8zq5nh1QxJ8kXCRwbNQlzXpnI="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "5b82793ef7196f7b3583e85669ced211cd8b5ff2"; - hash = "sha256-gcOvk7qFHZgJWE9CpucC8zwayYw47VbC3lmSRu4JQFg="; + rev = "b2e7cc755159196e3a068c8594f7acbaecfdaaac"; + hash = "sha256-IFvGTOkaRSNgZOj8DziRj88yH5JRF+wgSDZ5N0GNvjk="; }; aws-sdk-cpp-arrow = aws-sdk-cpp.override { @@ -81,12 +81,13 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "11.0.0"; + version = "12.0.0"; src = fetchurl { 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"; # versions are all taken from diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 399931db4b0..90fae9e2722 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -85,15 +85,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - # fix on current master - patches = [ - (fetchpatch { - url = "https://github.com/apache/arrow/commit/bce43175aa8cfb4534d3efbcc092f697f25f0f5a.patch"; - hash = "sha256-naOAQjQgSKIoCAGCKr7N4dCkOMtweAdfggGOQKDY3k0="; - stripLen = 1; - }) - ]; - preBuild = '' export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; @@ -106,6 +97,9 @@ buildPythonPackage rec { ''; 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 # 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 |