diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-07-29 23:01:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 23:01:14 -0400 |
commit | 303e44b3c11a1ed3b470f90bc6d1f03efdb87239 (patch) | |
tree | f272fd222f3438ca635f225a72cd50ab8aa4fc3e /pkgs/development | |
parent | 839c8785bae8bc1bde8eadddfe252947f11e2095 (diff) | |
parent | 51b1d4b421740ceddf556b9e425b955d1ca3c53a (diff) | |
download | nixpkgs-303e44b3c11a1ed3b470f90bc6d1f03efdb87239.tar nixpkgs-303e44b3c11a1ed3b470f90bc6d1f03efdb87239.tar.gz nixpkgs-303e44b3c11a1ed3b470f90bc6d1f03efdb87239.tar.bz2 nixpkgs-303e44b3c11a1ed3b470f90bc6d1f03efdb87239.tar.lz nixpkgs-303e44b3c11a1ed3b470f90bc6d1f03efdb87239.tar.xz nixpkgs-303e44b3c11a1ed3b470f90bc6d1f03efdb87239.tar.zst nixpkgs-303e44b3c11a1ed3b470f90bc6d1f03efdb87239.zip |
Merge pull request #131994 from tobim/pkgs/arrow-cpp-5.0.0
arrow-cpp: 4.0.1 -> 5.0.0
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/arrow-cpp/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyarrow/default.nix | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a13ebf28193..bea56617468 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -9,25 +9,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235"; - sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i"; + rev = "6d98243093c0b36442da94de7010f3eacc2a9909"; + hash = "sha256-n57Fuz2k6sX1o3vYBmC41eRKGnyt9+YL5r3WTHHRRzw="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; rev = "ddd898958803cb89b7156c6350584d1cda0fe8de"; - sha256 = "0n16xqlpxn2ryp43w8pppxrbwmllx6sk4hv3ycgikfj57nd3ibc0"; + hash = "sha256-gK04mj1Fuhkf82NDMrXplFa+cr/3Ij7I9VnYfinuJlg="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "4.0.1"; + version = "5.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m"; + hash = "sha256-w7QxPspZTCD3Yag2cZchqvB2AAGviWuuw6tkQg/5kQo="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { # ./cpp/thirdparty/versions.txt url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; - sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; }; ARROW_MIMALLOC_URL = fetchurl { @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz"; - sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs"; + "https://github.com/microsoft/mimalloc/archive/v1.7.2.tar.gz"; + hash = "sha256-sZEuNUVlpLaYQQ91g8D4OTSm27Ot5Uq33csVaTIJNr0="; }; patches = [ diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 989433b499d..e9510d9552c 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -41,9 +41,9 @@ buildPythonPackage rec { # enabled in nixpkgs. # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 "--deselect=pyarrow/tests/test_memory.py::test_env_var" - # Deselect the parquet dataset write test because it erroneously fails to find the + # Deselect a parquet dataset test because it erroneously fails to find the # pyarrow._dataset module. - "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem" + "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" ]; dontUseSetuptoolsCheck = true; |