aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2021-06-05 01:44:46 +0200
committerRicardo Wurmus <rekado@elephly.net>2021-06-05 09:12:39 +0200
commit1b0338d76b86a522045ca9a6060e7531578dc8f5 (patch)
treea97f53e39a46ebc15fdc92fdb2778e7eeefb964e
parent53ec97713a74da0acb9def81d25ff3e6dd6112f6 (diff)
downloadguix-1b0338d76b86a522045ca9a6060e7531578dc8f5.tar.gz
guix-1b0338d76b86a522045ca9a6060e7531578dc8f5.zip
gnu: r-rhdf5lib: Update to 1.14.0.
* gnu/packages/bioconductor.scm (r-rhdf5lib): Update to 1.14.0. [source]: Update deletions. [arguments]: Update substitutions. [inputs]: Move zlib from here... [propagated-inputs]: ...to here.
-rw-r--r--gnu/packages/bioconductor.scm19
1 files changed, 9 insertions, 10 deletions
diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index fe365b4d86..81fbbab82a 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -12253,22 +12253,21 @@ block processing.")
(define-public r-rhdf5lib
(package
(name "r-rhdf5lib")
- (version "1.12.1")
+ (version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rhdf5lib" version))
(sha256
(base32
- "14fnq4gijxp2l7985pksfk52i6klvy81r3892lnna73c6hh1dj28"))
+ "1ypqmd4nz4hxlb2qsay7f5784dqdjhc3b19pckzkhb65bfycdn87"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled binaries
(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")
+ (delete-file "src/hdf5small_cxx_hl_1.10.7.tar.gz")
#t))))
(properties `((upstream-name . "Rhdf5lib")))
(build-system r-build-system)
@@ -12280,7 +12279,9 @@ block processing.")
(for-each delete-file '("configure" "configure.ac"))
;; Do not make other packages link with the proprietary libsz.
(substitute* "R/zzz.R"
- ((" \"%s/libsz.a\"") ""))
+ ((" \"%s/libsz.a\"") "")
+ (("patharch, .getDynamicLinks")
+ ".getDynamicLinks"))
(with-directory-excursion "src"
(invoke "tar" "xvf" (assoc-ref inputs "hdf5-source"))
(rename-file (string-append "hdf5-" ,(package-version hdf5-1.10))
@@ -12319,12 +12320,10 @@ block processing.")
(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")))
- #t)))))
- (inputs
- `(("zlib" ,zlib)))
+ (("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n"))))))))
(propagated-inputs
- `(("hdf5" ,hdf5-1.10)))
+ `(("hdf5" ,hdf5-1.10)
+ ("zlib" ,zlib)))
(native-inputs
`(("hdf5-source" ,(package-source hdf5-1.10))
("r-knitr" ,r-knitr)))