me
/
guix
Archived
1
0
Fork 0
Code

gnu: r-cytolib: Update to 2.14.1. 

* gnu/packages/bioconductor.scm (r-cytolib): Update to 2.14.1.
[source]: Do not unbundle included boost.
[arguments]: Remove.
[inputs]: Remove boost.

Change-Id: Ibe26b9df3f73e67fb9f53676a2c27a5aed714895
master
Ricardo Wurmus 2024-01-21 00:16:14 +01:00
parent e1d3be4113
commit 8ca35ca44f
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/bioconductor.scm
View File

@ -18097,41 +18097,23 @@ datasets, which increases the analytical flexibility and the statistical power
of the analyses while minimizing technical noise.") of the analyses while minimizing technical noise.")
(license license:expat)))) (license license:expat))))
;; This package bundles a version of Boost. We cannot use the latest version
;; of Boost here, as we also need to make sure that the BH (r-bh) package is
;; compatible with whatever this package bundles.
(define-public r-cytolib (define-public r-cytolib
(package (package
(name "r-cytolib") (name "r-cytolib")
(version "2.14.0") (version "2.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "cytolib" version)) (uri (bioconductor-uri "cytolib" version))
(sha256 (sha256
(base32 (base32
"1r2slhzrp3gf45k5gknqgj3vjz7p0rx2yjzrbp020inj82fp4mgi")) "1kagik93ddcl3m1i2bqzzlh18lbxywfn3pxmp47p45kayzxzldrf"))))
;; Remove bundled boost sources
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "src/boost"))))
(properties `((upstream-name . "cytolib"))) (properties `((upstream-name . "cytolib")))
(build-system r-build-system) (build-system r-build-system)
(arguments (inputs (list openblas protobuf zlib))
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'unbundle
(lambda _
(substitute* "src/Makevars.in"
(("\\$\\(USERLIB\\): \\$\\{boost_fs_objs\\}")
"$(USERLIB):")
(("\\$\\{cytolib_objs\\} \\$\\{boost_fs_objs\\} \\$\\{boost_sys_objs\\}")
"${cytolib_objs}")
(("PKG_CPPFLAGS =")
"PKG_CPPFLAGS = -lboost_filesystem")
#;
(("^BOOSTFSLIB.*")
(string-append "BOOSTFSLIB="
#$(this-package-input "boost") "/libboost_filesystem.so\n"))))))))
(inputs (list boost openblas protobuf zlib))
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
(propagated-inputs (propagated-inputs