diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-12-15 15:02:29 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-12-15 15:38:57 +0100 |
| commit | 1f5d262cfd7f00c950d698cc22390ea383d485e7 (patch) | |
| tree | 1e7c459d5d99971f17dee76058faaf5c01a8ec71 | |
| parent | 8804e4b48e925c4f22bd2fa5b9e8a2b141274eea (diff) | |
| download | guix-1f5d262cfd7f00c950d698cc22390ea383d485e7.tar.gz guix-1f5d262cfd7f00c950d698cc22390ea383d485e7.zip | |
gnu: r-rhdf5lib: Update to 1.8.0.
* gnu/packages/bioinformatics.scm (r-rhdf5lib): Update to 1.8.0.
[arguments]: Update patches.
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 95967fdff2..743f593a13 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10487,14 +10487,14 @@ block processing.") (define-public r-rhdf5lib (package (name "r-rhdf5lib") - (version "1.6.3") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhdf5lib" version)) (sha256 (base32 - "0q68n5jm7w99paibj8vkxbdksbyrxilzwc9dkp3zf8zrdc5qfxzy")) + "17lhwnm9rqsvbqkvwp0m07vjrk63a4389p2y39zffv8fgznxqzd7")) (modules '((guix build utils))) (snippet '(begin @@ -10511,10 +10511,14 @@ block processing.") (for-each delete-file '("configure" "configure.ac")) ;; Do not make other packages link with the proprietary libsz. (substitute* "R/zzz.R" - (("'%s/libhdf5_cpp.a %s/libhdf5.a %s/libsz.a -lz'") - "'%s/libhdf5_cpp.a %s/libhdf5.a %s/libhdf5.a -lz'") - (("'%s/libhdf5.a %s/libsz.a -lz'") - "'%s/libhdf5.a %s/libhdf5.a -lz'")) + (("'\"%s/libhdf5.a\" \"%s/libsz.a\" -lz'") + "'\"%s/libhdf5.a\" \"%s/libhdf5.a\" -lz'") + (("'\"%s/libhdf5_cpp.a\" \"%s/libhdf5.a\" \"%s/libsz.a\" -lz'") + "'\"%s/libhdf5_cpp.a\" \"%s/libhdf5.a\" \"%s/libhdf5.a\" -lz'") + (("'%s/libhdf5_hl.a %s/libhdf5.a %s/libsz.a -lz'") + "'%s/libhdf5_hl.a %s/libhdf5.a %s/libhdf5.a -lz'") + (("'%s/libhdf5_hl_cpp.a %s/libhdf5_hl.a %s/libhdf5_cpp.a %s/libhdf5.a %s/libsz.a -lz'") + "'%s/libhdf5_hl_cpp.a %s/libhdf5_hl.a %s/libhdf5_cpp.a %s/libhdf5.a %s/libhdf5.a -lz'")) (with-directory-excursion "src" (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) (rename-file (string-append "hdf5-" ,(package-version hdf5-1.10)) @@ -10539,6 +10543,14 @@ block processing.") (assoc-ref inputs "hdf5") "/lib/libhdf5.a\n")) (("HDF5_CXX_INCLUDE=.*") "HDF5_CXX_INCLUDE=./hdf5/c++/src\n") (("HDF5_INCLUDE=.*") "HDF5_INCLUDE=./hdf5/src\n") + (("HDF5_HL_INCLUDE=.*") "HDF5_HL_INCLUDE=./hdf5/hl/src\n") + (("HDF5_HL_CXX_INCLUDE=.*") "HDF5_HL_CXX_INCLUDE=./hdf5/hl/c++/src\n") + (("HDF5_HL_LIB=.*") + (string-append "HDF5_HL_LIB=" + (assoc-ref inputs "hdf5") "/lib/libhdf5_hl.a\n")) + (("HDF5_HL_CXX_LIB=.*") + (string-append "HDF5_HL_CXX_LIB=" + (assoc-ref inputs "hdf5") "/lib/libhdf5_hl_cpp.a\n")) ;; szip is non-free software (("cp \"\\$\\{SZIP_LIB\\}.*") "") (("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n"))) |