From 563e7d183dffdd1cbb0f9b4b68b9f6834d37e6fd Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Mon, 4 Jul 2022 14:53:28 +0800 Subject: [PATCH] hdf5_1_10: 1.10.6 -> 1.10.9 pythonPackages.tables is updated, the version pin is removed. The bin-mv.patch is applied upstream. (cherry picked from commit b3aee32add2396c1521b83b5c6c92e4c53108bcc) --- pkgs/tools/misc/hdf5/1.10.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 74d8fce599a8..fbfac18414c8 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -12,12 +12,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - # pinned to 1.10.6 for pythonPackages.tables v3.6.1. tables has test errors for hdf5 > 1.10.6. https://github.com/PyTables/PyTables/issues/845 - version = "1.10.6"; + version = "1.10.9"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; + sha256 = "sha256-AMS+cJbzb9yvpPl04SbGwUEkKOOOvHsYHZB0WeeB8ZE="; }; outputs = [ "out" "dev" ]; @@ -31,9 +30,7 @@ stdenv.mkDerivation rec { configureFlags = optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java"; - patches = [ - ./bin-mv.patch - ]; + patches = [ ]; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +