From 6bcd43b07b1eec7c8d1d5486e2fa76de1fff5dcd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 26 Jun 2026 15:51:40 +0200 Subject: [PATCH 1/3] python3Packages.hdf5plugin: cleanup --- .../python-modules/hdf5plugin/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index a52e339e0630..9ca355a34d2c 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -90,17 +90,20 @@ buildPythonPackage (finalAttrs: { mkdir src/hdf5plugin/plugins mkdir -p pkg-config - ln -s ${lib.getDev bzip2}/lib/pkgconfig/bzip2.pc pkg-config/bz2.pc - # zfp ships only a CMake config; synthesise the pkg-config module hdf5plugin probes for - { - echo "includedir=${lib.getDev zfp'}/include" - echo "Name: zfp" - echo "Version: ${zfp'.version}" - echo "Description: zfp" - echo "Libs: -L${lib.getLib zfp'}/lib -lzfp" - echo "Cflags: -I${lib.getDev zfp'}/include" - } > pkg-config/zfp.pc export PKG_CONFIG_PATH="$PWD/pkg-config''${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" + + # add expected alias for bzip2 + ln -s ${lib.getDev bzip2}/lib/pkgconfig/bzip2.pc pkg-config/bz2.pc + + # zfp ships only a CMake config; synthesise the pkg-config module hdf5plugin probes for + cat >pkg-config/zfp.pc < Date: Fri, 26 Jun 2026 15:08:10 +0200 Subject: [PATCH 2/3] python3Packages.hdf5plugin: 6.0.0 -> 7.0.0 --- pkgs/development/python-modules/hdf5plugin/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index 9ca355a34d2c..2476d3bdc4db 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -28,14 +28,14 @@ let in buildPythonPackage (finalAttrs: { pname = "hdf5plugin"; - version = "6.0.0"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; tag = "v${finalAttrs.version}"; - hash = "sha256-LW6rY+zLta4hENBbTll+1amf9TYJiuAumwzgpk1LZ3M="; + hash = "sha256-wi5EITlRI8tgAXUV5u/CA3eiWjNAVs5ynT+PUsqcqVA="; }; build-system = [ @@ -61,7 +61,7 @@ buildPythonPackage (finalAttrs: { env.HDF5PLUGIN_SYSTEM_LIBRARIES = lib.concatStringsSep "," [ "blosc" "blosc2" - "bz2" + "bzip2" "charls" "lz4" # "sperr" # not packaged? @@ -92,9 +92,6 @@ buildPythonPackage (finalAttrs: { mkdir -p pkg-config export PKG_CONFIG_PATH="$PWD/pkg-config''${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" - # add expected alias for bzip2 - ln -s ${lib.getDev bzip2}/lib/pkgconfig/bzip2.pc pkg-config/bz2.pc - # zfp ships only a CMake config; synthesise the pkg-config module hdf5plugin probes for cat >pkg-config/zfp.pc < Date: Fri, 26 Jun 2026 15:52:25 +0200 Subject: [PATCH 3/3] python3Packages.hdf5plugin: devendor some libs --- pkgs/development/python-modules/hdf5plugin/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index 2476d3bdc4db..e4731521e769 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -57,6 +57,16 @@ buildPythonPackage (finalAttrs: { zstd ]; + # devendor + postPatch = '' + rm -rf lib/c-blosc + rm -rf lib/c-blosc2 + rm -rf lib/bzip2 + rm -rf lib/charls + rm -rf lib/zfp + rm -rf lib/zstd + ''; + # opt-in to use use system libs instead env.HDF5PLUGIN_SYSTEM_LIBRARIES = lib.concatStringsSep "," [ "blosc"