diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix index 6dc9083f41dd..498e2246d258 100644 --- a/pkgs/by-name/ad/adios2/package.nix +++ b/pkgs/by-name/ad/adios2/package.nix @@ -11,7 +11,6 @@ python3Packages, mpi, bzip2, - lz4, c-blosc2, hdf5-mpi, libfabric, @@ -22,8 +21,6 @@ zeromq, zfp, zlib, - zlib-ng, - zstd, ucx, yaml-cpp, nlohmann_json, @@ -69,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: { [ mpi bzip2 - lz4 c-blosc2 (hdf5-mpi.override { inherit mpi; }) libfabric @@ -80,8 +76,6 @@ stdenv.mkDerivation (finalAttrs: { zeromq zfp zlib - zlib-ng # required by c-blocs2 - zstd # required by c-blocs2 yaml-cpp nlohmann_json diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix index 745521a686b7..6349063e3dd9 100644 --- a/pkgs/development/libraries/c-blosc/1.nix +++ b/pkgs/development/libraries/c-blosc/1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ + propagatedBuildInputs = [ lz4 zlib zstd @@ -54,15 +54,19 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !static; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "Blosc2" ]; + package = finalAttrs.finalPackage; + }; + }; meta = with lib; { description = "Blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}"; - pkgConfigModules = [ - "blosc" - ]; + pkgConfigModules = [ "blosc2" ]; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix index 507c862c27f1..9c47d90f9849 100644 --- a/pkgs/development/libraries/c-blosc/2.nix +++ b/pkgs/development/libraries/c-blosc/2.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ + propagatedBuildInputs = [ lz4 zlib-ng zstd @@ -56,15 +56,19 @@ stdenv.mkDerivation (finalAttrs: { # possibly https://github.com/Blosc/c-blosc2/issues/432 enableParallelChecking = false; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "Blosc2" ]; + package = finalAttrs.finalPackage; + }; + }; meta = with lib; { description = "Fast, compressed, persistent binary data store library for C"; homepage = "https://www.blosc.org"; changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${finalAttrs.version}"; - pkgConfigModules = [ - "blosc2" - ]; + pkgConfigModules = [ "blosc2" ]; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ ris ];