diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-06-26 21:14:42 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-06-26 21:14:42 +0200 |
| commit | 90de72aacb4836e381afdd559e76daefdcf7171c (patch) | |
| tree | 97a9b2ab1e2ef04a23def5c8dd738f02121c7aeb /pkgs/tools/misc | |
| parent | 765ea68e5253980ed7c3c3206e3df79969e3e6da (diff) | |
| parent | 4e9dcbbbc60fab8995c89c7a6298b0ae47717d35 (diff) | |
Merge #239304: staging-next 2023-06-23
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/hdf5/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/rpcsvc-proto/default.nix | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 66c20078afb03..1dc0eda83f675 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -26,7 +26,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.14.1-2"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -34,8 +34,11 @@ stdenv.mkDerivation rec { + lib.optionalString threadsafe "-threadsafe"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-5OeUM0UO2uKGWkxjKBiLtFORsp10+MU47mmfCxFsK6A="; + url = let + majorMinor = lib.versions.majorMinor version; + majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; + in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; + sha256 = "sha256-BsoUHRo8MStdfMSCahJzcpOuExAxdIhhaJ9qLsghnb0="; }; passthru = { diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix index 3e8f62ff89540..b84bbb7d9d511 100644 --- a/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rpcsvc-proto"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk="; + sha256 = "sha256-DEXzSSmjMeMsr1PoU/ljaY+6b4COUU2Z8MJkGImsgzk="; }; patches = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; |