diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2020-10-23 12:12:34 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-10-23 16:35:39 +0200 |
| commit | c5372cd48897c29ee5555708f8a52b16ecae0612 (patch) | |
| tree | c82095e82c01e51ed9d5f6f848b484e6b1c05a9d | |
| parent | c9a656a5d009c5cb19591a83fd759e00bcb14c14 (diff) | |
| download | guix-c5372cd48897c29ee5555708f8a52b16ecae0612.tar guix-c5372cd48897c29ee5555708f8a52b16ecae0612.tar.gz | |
gnu: hdf5: Default to 1.10.
This is a followup to 593096355501dfd76c2e92b1fbd87f940ab1d1f2.
* gnu/packages/maths.scm (hdf5): Change to HDF5-1.10.
(hdf-java, hdf-eos5, h5check, netcdf, matio)[inputs]: Use HDF5-1.8.
* gnu/packages/java.scm (java-cisd-jhdf5)[inputs]: Likewise.
| -rw-r--r-- | gnu/packages/java.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/maths.scm | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 40b0a8c1dd..b4b3ce01eb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3296,7 +3296,7 @@ libraries from the SIS division at ETH Zurich like jHDF5.") ("java-cisd-args4j" ,java-cisd-args4j) ("java-commons-lang" ,java-commons-lang) ("java-commons-io" ,java-commons-io) - ("hdf5" ,hdf5) + ("hdf5" ,hdf5-1.8) ("zlib" ,zlib))) (native-inputs `(("jdk" ,icedtea-8) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2a909ec1d4..f7565dd885 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1203,7 +1203,7 @@ extremely large and complex data collections.") (define-public hdf5 ;; Default version of HDF5. - hdf5-1.8) + hdf5-1.10) (define-public hdf-java (package @@ -1235,7 +1235,7 @@ extremely large and complex data collections.") ("slf4j-simple" ,java-slf4j-simple))) (inputs `(("hdf4" ,hdf4) - ("hdf5" ,hdf5) + ("hdf5" ,hdf5-1.8) ("zlib" ,zlib) ("libjpeg" ,libjpeg-turbo) ("slf4j-api" ,java-slf4j-api))) @@ -1395,7 +1395,7 @@ System (Grid, Point and Swath).") `(("gfortran" ,gfortran))) (build-system gnu-build-system) (inputs - `(("hdf5" ,hdf5) + `(("hdf5" ,hdf5-1.8) ("zlib" ,zlib) ("gctp" ,gctp))) (arguments @@ -1496,7 +1496,7 @@ Blosc-compressed datasets.") (base32 "1gm76jbwhz9adbxgn14zx8cj33dmjdr2g5xcy0m9c2gakp8w59kj")))) (build-system gnu-build-system) - (inputs `(("hdf5" ,hdf5))) ;h5cc for tests + (inputs `(("hdf5" ,hdf5-1.8))) ;h5cc for tests (home-page "https://www.hdfgroup.org/products/hdf5_tools/h5check.html") (synopsis "HDF5 format checker") (description "@code{h5check} is a validation tool for verifying that an @@ -1556,7 +1556,10 @@ similar to MATLAB, GNU Octave or SciPy.") ("graphviz" ,graphviz))) (inputs `(("hdf4" ,hdf4-alt) - ("hdf5" ,hdf5) + + ;; XXX: The 'tst_nccopy4.sh' test fails when using hdf5-1.10. + ("hdf5" ,hdf5-1.8) + ("zlib" ,zlib) ("libjpeg" ,libjpeg-turbo))) (arguments @@ -4537,7 +4540,7 @@ structured and unstructured grid problems."))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) - ("hdf5" ,hdf5))) + ("hdf5" ,hdf5-1.8))) (home-page "http://matio.sourceforge.net/") (synopsis "Library for reading and writing MAT files") (description "Matio is a library for reading and writing MAT files. It |