diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2020-06-12 16:35:25 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2020-06-13 01:19:46 +0200 |
commit | 87d5444d9f0042b70d1bb865ce584a25977343e6 (patch) | |
tree | 6d5eb2067aa783074e10f704668f21001c3f7a14 /gnu/packages/bioinformatics.scm | |
parent | cf907680e893896fd831409f329f06cf593a496c (diff) |
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.
Diffstat (limited to 'gnu/packages/bioinformatics.scm')
-rw-r--r-- | gnu/packages/bioinformatics.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5ef81d20d2..ff815187c7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10868,19 +10868,22 @@ block processing.") (define-public r-rhdf5lib (package (name "r-rhdf5lib") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhdf5lib" version)) (sha256 (base32 - "17lhwnm9rqsvbqkvwp0m07vjrk63a4389p2y39zffv8fgznxqzd7")) + "09ylwyk6a8sdrmi1mx7vpycpykqlqylmwa973g6jrcmk0h0qfa4w")) (modules '((guix build utils))) (snippet '(begin ;; 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)))) (properties `((upstream-name . "Rhdf5lib"))) (build-system r-build-system) @@ -10916,6 +10919,8 @@ block processing.") "C Compiler: GCC\n")) (rename-file "Makevars.in" "Makevars") (substitute* "Makevars" + (("@ZLIB_LIB@") "-lz") + (("@ZLIB_INCLUDE@") "") (("HDF5_CXX_LIB=.*") (string-append "HDF5_CXX_LIB=" (assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n")) @@ -10941,7 +10946,8 @@ block processing.") (propagated-inputs `(("hdf5" ,hdf5-1.10))) (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") (synopsis "HDF5 library as an R package") (description "This package provides C and C++ HDF5 libraries for use in R |