cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

hdf5-mpi,hdf5-cpp,hdf5-fortran,hdf5-threadsafe: remove appendToName to

Browse source 
have a consistent package name for repology
This commit is contained in:
Felix Buehler 2022-02-14 23:44:05 +01:00
parent 80de80f9cf
commit 8250f0f4ea
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tools/misc/hdf5/default.nix
View file

@ -15,6 +15,7 @@
, javaSupport ? false
, jdk
, usev110Api ? false
, threadsafe ? false
}:
# cpp and mpi options are mutually exclusive
@ -25,9 +26,14 @@ let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
version = "1.12.1";
pname = "hdf5";
pname = "hdf5"
+ lib.optionalString cppSupport "-cpp"
+ lib.optionalString fortranSupport "-fortran"
+ lib.optionalString mpiSupport "-mpi"
+ lib.optionalString threadsafe "-threadsafe";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2";
url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2";
sha256 = "sha256-qvn1MrPtqD09Otyfi0Cpt2MVIhj6RTScO8d1Asofjxw=";
};
@ -63,7 +69,9 @@ stdenv.mkDerivation rec {
++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ]
++ optional enableShared "--enable-shared"
++ optional javaSupport "--enable-java"
++ optional usev110Api "--with-default-api-version=v110";
++ optional usev110Api "--with-default-api-version=v110"
# hdf5 hl (High Level) library is not considered stable with thread safety and should be disabled.
++ optionals threadsafe [ "--enable-threadsafe" "--disable-hl" ];
patches = [
./bin-mv.patch

19
pkgs/top-level/all-packages.nix
View file

@ -6395,24 +6395,13 @@ with pkgs;
hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { };
hdf5-mpi = appendToName "mpi" (hdf5.override {
mpiSupport = true;
});
hdf5-mpi = hdf5.override { mpiSupport = true; };
hdf5-cpp = appendToName "cpp" (hdf5.override {
cppSupport = true;
});
hdf5-cpp = hdf5.override { cppSupport = true; };
hdf5-fortran = appendToName "fortran" (hdf5.override {
fortranSupport = true;
});
hdf5-fortran = hdf5.override { fortranSupport = true; };
hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: {
# Threadsafe hdf5
# However, hdf5 hl (High Level) library is not considered stable
# with thread safety and should be disabled.
configureFlags = oldAttrs.configureFlags ++ ["--enable-threadsafe" "--disable-hl" ];
}));
hdf5-threadsafe = hdf5.override { threadsafe = true; };
hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { };