mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-17 12:30:38 +02:00
gnu: r-voltron: Update to 0.2.0-2.bbd7abb.
* gnu/packages/bioinformatics.scm (r-voltron): Update to 0.2.0-2.bbd7abb. [arguments]: Add phase 'do-not-use-conda. [propagated-inputs]: Remove r-basilisk; add r-pizzarr and r-rhdf5. Change-Id: I4c57c154c8bac41d056fadb936a109ca6310d8d6
This commit is contained in:
parent
b6b35e2966
commit
617c42ac30
1 changed files with 24 additions and 8 deletions
|
@ -22212,8 +22212,8 @@ patterns.")
|
||||||
(license license:gpl3))))
|
(license license:gpl3))))
|
||||||
|
|
||||||
(define-public r-voltron
|
(define-public r-voltron
|
||||||
(let ((commit "9f9415c72e9347f578a166981842d33e43b0466d")
|
(let ((commit "bbd7abb72681ae6dc91cb2f8fe4f3ce3a246f56b")
|
||||||
(revision "1"))
|
(revision "2"))
|
||||||
(package
|
(package
|
||||||
(name "r-voltron")
|
(name "r-voltron")
|
||||||
(version (git-version "0.2.0" revision commit))
|
(version (git-version "0.2.0" revision commit))
|
||||||
|
@ -22225,14 +22225,29 @@ patterns.")
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0bvvpj96ix2ij6034dfrh7za1lvf73qxqsdvbs2wrpc931s18q32"))))
|
(base32 "1h5m2r2hdp73yqsz60wq1sf98dbsqpx155qlxbxnzvhc0l8hjshd"))))
|
||||||
(properties `((upstream-name . "VoltRon")))
|
(properties `((upstream-name . "VoltRon")))
|
||||||
(build-system r-build-system)
|
(build-system r-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
;; By default VoltRon will use Basilisk, which uses Conda to set
|
||||||
|
;; up a Python environment. We override the fallback default
|
||||||
|
;; here. Users can still override the location of the Python
|
||||||
|
;; interpreter with the option "voltron.python.path".
|
||||||
|
(add-after 'unpack 'do-not-use-conda
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(substitute* "R/conversion.R"
|
||||||
|
(("return\\(NULL\\)")
|
||||||
|
(string-append "Sys.setenv(GUIX_PYTHONPATH=\""
|
||||||
|
(getenv "GUIX_PYTHONPATH")
|
||||||
|
"\"); return(\""
|
||||||
|
(search-input-file inputs "/bin/python3")
|
||||||
|
"\")"))))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list opencv
|
(list opencv
|
||||||
;; These Python inputs would be fetched by Basilisk via Conda.
|
;; These Python inputs are used via reticulate.
|
||||||
;; We add these inputs in anticipation of an upstream change to
|
|
||||||
;; allow for a Conda-free use of the package.
|
|
||||||
python
|
python
|
||||||
python-numpy
|
python-numpy
|
||||||
python-pandas
|
python-pandas
|
||||||
|
@ -22245,8 +22260,7 @@ patterns.")
|
||||||
python-tifffile
|
python-tifffile
|
||||||
python-zarr
|
python-zarr
|
||||||
zlib))
|
zlib))
|
||||||
(propagated-inputs (list r-basilisk
|
(propagated-inputs (list r-data-table
|
||||||
r-data-table
|
|
||||||
r-dplyr
|
r-dplyr
|
||||||
r-ebimage
|
r-ebimage
|
||||||
r-ggplot2
|
r-ggplot2
|
||||||
|
@ -22257,6 +22271,7 @@ patterns.")
|
||||||
r-irlba
|
r-irlba
|
||||||
r-magick
|
r-magick
|
||||||
r-matrix
|
r-matrix
|
||||||
|
r-pizzarr
|
||||||
r-rann
|
r-rann
|
||||||
r-rcdt
|
r-rcdt
|
||||||
r-rcpp
|
r-rcpp
|
||||||
|
@ -22264,6 +22279,7 @@ patterns.")
|
||||||
r-rcpparmadillo
|
r-rcpparmadillo
|
||||||
r-reshape2
|
r-reshape2
|
||||||
r-reticulate
|
r-reticulate
|
||||||
|
r-rhdf5
|
||||||
r-rjson
|
r-rjson
|
||||||
r-rlang
|
r-rlang
|
||||||
r-s4arrays
|
r-s4arrays
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue