Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hdf5: 1.14.3 -> 1.14.4.3 #309595

Merged
merged 2 commits into from
Jun 20, 2024
+7 −10
Merged

hdf5: 1.14.3 -> 1.14.4.3 #309595

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20eab24
hdf5: 1.14.3 -> 1.14.4.2
markuskowa May 6, 2024
38c661b
hdf5: 1.14.4.2 -> 1.14.4.3
markuskowa May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions pkgs/tools/misc/hdf5/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, cmake
, removeReferencesTo
, cppSupport ? true
Expand Down Expand Up @@ -28,21 +28,18 @@ assert !cppSupport || !mpiSupport;
let inherit (lib) optional optionals; in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use of the optional and optionals defined here is inconsistent within this package as there are also uses of lib.optional and lib.optionals. I'd like to recommend to remove this definition here and replace uses optional and optionals with lib.optional and lib.optionals.


stdenv.mkDerivation rec {
Copy link
Member

@afh afh May 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be a preference for using finalAttrs over rec… (remember add ) at the end of the package to close the newly opened ( here)

Suggested change
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {

version = "1.14.3";
version = "1.14.4.3";
pname = "hdf5"
+ lib.optionalString cppSupport "-cpp"
+ lib.optionalString fortranSupport "-fortran"
+ lib.optionalString mpiSupport "-mpi"
+ lib.optionalString threadsafe "-threadsafe";

src = fetchurl {
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-lCXyJO110SgLtG1vJpI92Tj5BA5+rr9X5m7HNXwI+Rc=";
src = fetchFromGitHub {
owner = "HDFGroup";
repo = "hdf5";
rev = "hdf5_${version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the finalAttrs suggestion above is accepted the following change is necessary:

Suggested change
rev = "hdf5_${version}";
rev = "hdf5_${finalAttrs.version}";

hash = "sha256-lvz3x04SS0oZmUn/BIxQEHnugaDOws46kfT3NAw7Hos=";
};

passthru = {
Expand Down