me
/
guix
Archived
1
0
Fork 0
Code

gnu: hdf5: Default to 1.10. 

This is a followup to 5930963555.

* 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.
master
Ludovic Courtès 2020-10-23 12:12:34 +02:00 committed by Ludovic Courtès
parent c9a656a5d0
commit c5372cd488
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/java.scm
View File

@ -3296,7 +3296,7 @@ libraries from the SIS division at ETH Zurich like jHDF5.")
("java-cisd-args4j" ,java-cisd-args4j) ("java-cisd-args4j" ,java-cisd-args4j)
("java-commons-lang" ,java-commons-lang) ("java-commons-lang" ,java-commons-lang)
("java-commons-io" ,java-commons-io) ("java-commons-io" ,java-commons-io)
("hdf5" ,hdf5) ("hdf5" ,hdf5-1.8)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("jdk" ,icedtea-8) `(("jdk" ,icedtea-8)

15
gnu/packages/maths.scm
View File

@ -1203,7 +1203,7 @@ extremely large and complex data collections.")
(define-public hdf5 (define-public hdf5
;; Default version of HDF5. ;; Default version of HDF5.
hdf5-1.8) hdf5-1.10)
(define-public hdf-java (define-public hdf-java
(package (package
@ -1235,7 +1235,7 @@ extremely large and complex data collections.")
("slf4j-simple" ,java-slf4j-simple))) ("slf4j-simple" ,java-slf4j-simple)))
(inputs (inputs
`(("hdf4" ,hdf4) `(("hdf4" ,hdf4)
("hdf5" ,hdf5) ("hdf5" ,hdf5-1.8)
("zlib" ,zlib) ("zlib" ,zlib)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("slf4j-api" ,java-slf4j-api))) ("slf4j-api" ,java-slf4j-api)))
@ -1395,7 +1395,7 @@ System (Grid, Point and Swath).")
`(("gfortran" ,gfortran))) `(("gfortran" ,gfortran)))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("hdf5" ,hdf5) `(("hdf5" ,hdf5-1.8)
("zlib" ,zlib) ("zlib" ,zlib)
("gctp" ,gctp))) ("gctp" ,gctp)))
(arguments (arguments
@ -1496,7 +1496,7 @@ Blosc-compressed datasets.")
(base32 (base32
"1gm76jbwhz9adbxgn14zx8cj33dmjdr2g5xcy0m9c2gakp8w59kj")))) "1gm76jbwhz9adbxgn14zx8cj33dmjdr2g5xcy0m9c2gakp8w59kj"))))
(build-system gnu-build-system) (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") (home-page "https://www.hdfgroup.org/products/hdf5_tools/h5check.html")
(synopsis "HDF5 format checker") (synopsis "HDF5 format checker")
(description "@code{h5check} is a validation tool for verifying that an (description "@code{h5check} is a validation tool for verifying that an
@ -1556,7 +1556,10 @@ similar to MATLAB, GNU Octave or SciPy.")
("graphviz" ,graphviz))) ("graphviz" ,graphviz)))
(inputs (inputs
`(("hdf4" ,hdf4-alt) `(("hdf4" ,hdf4-alt)
("hdf5" ,hdf5)
;; XXX: The 'tst_nccopy4.sh' test fails when using hdf5-1.10.
("hdf5" ,hdf5-1.8)
("zlib" ,zlib) ("zlib" ,zlib)
("libjpeg" ,libjpeg-turbo))) ("libjpeg" ,libjpeg-turbo)))
(arguments (arguments
@ -4537,7 +4540,7 @@ structured and unstructured grid problems.")))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("zlib" ,zlib) `(("zlib" ,zlib)
("hdf5" ,hdf5))) ("hdf5" ,hdf5-1.8)))
(home-page "http://matio.sourceforge.net/") (home-page "http://matio.sourceforge.net/")
(synopsis "Library for reading and writing MAT files") (synopsis "Library for reading and writing MAT files")
(description "Matio is a library for reading and writing MAT files. It (description "Matio is a library for reading and writing MAT files. It