From c5372cd48897c29ee5555708f8a52b16ecae0612 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Fri, 23 Oct 2020 12:12:34 +0200
Subject: 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.
---
 gnu/packages/maths.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/maths.scm')

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 @@ (define-public hdf5-1.10
 
 (define-public hdf5
   ;; Default version of HDF5.
-  hdf5-1.8)
+  hdf5-1.10)
 
 (define-public hdf-java
   (package
@@ -1235,7 +1235,7 @@ (define-public hdf-java
        ("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 @@ (define-public hdf-eos5
      `(("gfortran" ,gfortran)))
     (build-system gnu-build-system)
     (inputs
-     `(("hdf5" ,hdf5)
+     `(("hdf5" ,hdf5-1.8)
        ("zlib" ,zlib)
        ("gctp" ,gctp)))
     (arguments
@@ -1496,7 +1496,7 @@ (define-public h5check
         (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 @@ (define-public netcdf
        ("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 @@ (define-public matio
     (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
-- 
cgit v1.2.3