gnu: r-rhdf5lib: Update to 1.10.0.

* gnu/packages/bioinformatics.scm (r-rhdf5lib): Update to 1.10.0.
[source]: Update snippet.
[arguments]: Replace ZLIB variables in Makevars.
[native-inputs]: Add r-knitr.
This commit is contained in:
Ricardo Wurmus 2020-06-12 16:35:25 +02:00
parent cf907680e8
commit 87d5444d9f
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -10868,19 +10868,22 @@ (define-public r-hdf5array
(define-public r-rhdf5lib (define-public r-rhdf5lib
(package (package
(name "r-rhdf5lib") (name "r-rhdf5lib")
(version "1.8.0") (version "1.10.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rhdf5lib" version)) (uri (bioconductor-uri "Rhdf5lib" version))
(sha256 (sha256
(base32 (base32
"17lhwnm9rqsvbqkvwp0m07vjrk63a4389p2y39zffv8fgznxqzd7")) "09ylwyk6a8sdrmi1mx7vpycpykqlqylmwa973g6jrcmk0h0qfa4w"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Delete bundled binaries ;; Delete bundled binaries
(delete-file-recursively "src/winlib/") (delete-file-recursively "src/wininclude/")
(delete-file-recursively "src/winlib-4.9.3/")
(delete-file-recursively "src/winlib-8.3.0/")
(delete-file "src/hdf5small_cxx_hl_1.10.6.tar.gz")
#t)))) #t))))
(properties `((upstream-name . "Rhdf5lib"))) (properties `((upstream-name . "Rhdf5lib")))
(build-system r-build-system) (build-system r-build-system)
@ -10916,6 +10919,8 @@ (define-public r-rhdf5lib
"C Compiler: GCC\n")) "C Compiler: GCC\n"))
(rename-file "Makevars.in" "Makevars") (rename-file "Makevars.in" "Makevars")
(substitute* "Makevars" (substitute* "Makevars"
(("@ZLIB_LIB@") "-lz")
(("@ZLIB_INCLUDE@") "")
(("HDF5_CXX_LIB=.*") (("HDF5_CXX_LIB=.*")
(string-append "HDF5_CXX_LIB=" (string-append "HDF5_CXX_LIB="
(assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n")) (assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n"))
@ -10941,7 +10946,8 @@ (define-public r-rhdf5lib
(propagated-inputs (propagated-inputs
`(("hdf5" ,hdf5-1.10))) `(("hdf5" ,hdf5-1.10)))
(native-inputs (native-inputs
`(("hdf5-source" ,(package-source hdf5-1.10)))) `(("hdf5-source" ,(package-source hdf5-1.10))
("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/Rhdf5lib") (home-page "https://bioconductor.org/packages/Rhdf5lib")
(synopsis "HDF5 library as an R package") (synopsis "HDF5 library as an R package")
(description "This package provides C and C++ HDF5 libraries for use in R (description "This package provides C and C++ HDF5 libraries for use in R