Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 57ef4455 ad546685

Changed files
+12 -12
pkgs
development
libraries
arrow-cpp
python-modules
pyarrow
web
nodejs
+8 -8
pkgs/development/libraries/arrow-cpp/default.nix
··· 9 9 arrow-testing = fetchFromGitHub { 10 10 owner = "apache"; 11 11 repo = "arrow-testing"; 12 - rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235"; 13 - sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i"; 12 + rev = "6d98243093c0b36442da94de7010f3eacc2a9909"; 13 + hash = "sha256-n57Fuz2k6sX1o3vYBmC41eRKGnyt9+YL5r3WTHHRRzw="; 14 14 }; 15 15 16 16 parquet-testing = fetchFromGitHub { 17 17 owner = "apache"; 18 18 repo = "parquet-testing"; 19 19 rev = "ddd898958803cb89b7156c6350584d1cda0fe8de"; 20 - sha256 = "0n16xqlpxn2ryp43w8pppxrbwmllx6sk4hv3ycgikfj57nd3ibc0"; 20 + hash = "sha256-gK04mj1Fuhkf82NDMrXplFa+cr/3Ij7I9VnYfinuJlg="; 21 21 }; 22 22 23 23 in stdenv.mkDerivation rec { 24 24 pname = "arrow-cpp"; 25 - version = "4.0.1"; 25 + version = "5.0.0"; 26 26 27 27 src = fetchurl { 28 28 url = 29 29 "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; 30 - sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m"; 30 + hash = "sha256-w7QxPspZTCD3Yag2cZchqvB2AAGviWuuw6tkQg/5kQo="; 31 31 }; 32 32 sourceRoot = "apache-arrow-${version}/cpp"; 33 33 ··· 37 37 # ./cpp/thirdparty/versions.txt 38 38 url = 39 39 "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; 40 - sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; 40 + hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; 41 41 }; 42 42 43 43 ARROW_MIMALLOC_URL = fetchurl { ··· 45 45 # ./cpp/cmake_modules/ThirdpartyToolchain.cmake 46 46 # ./cpp/thirdparty/versions.txt 47 47 url = 48 - "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz"; 49 - sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs"; 48 + "https://github.com/microsoft/mimalloc/archive/v1.7.2.tar.gz"; 49 + hash = "sha256-sZEuNUVlpLaYQQ91g8D4OTSm27Ot5Uq33csVaTIJNr0="; 50 50 }; 51 51 52 52 patches = [
+2 -2
pkgs/development/python-modules/pyarrow/default.nix
··· 41 41 # enabled in nixpkgs. 42 42 # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 43 43 "--deselect=pyarrow/tests/test_memory.py::test_env_var" 44 - # Deselect the parquet dataset write test because it erroneously fails to find the 44 + # Deselect a parquet dataset test because it erroneously fails to find the 45 45 # pyarrow._dataset module. 46 - "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem" 46 + "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" 47 47 ]; 48 48 49 49 dontUseSetuptoolsCheck = true;
+2 -2
pkgs/development/web/nodejs/v16.nix
··· 8 8 in 9 9 buildNodejs { 10 10 inherit enableNpm; 11 - version = "16.5.0"; 12 - sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; 11 + version = "16.6.0"; 12 + sha256 = "1ndrqx3k5m62r7nzl5za59m33bx10541n7xbaxxz7088ifh18msw"; 13 13 }