summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2024-01-22 12:38:27 +0100
committerRicardo Wurmus <rekado@elephly.net>2024-01-22 13:54:44 +0100
commit29353820f2df8e4434bbdae2d36b36d0151cc027 (patch)
treec05e062dd6fb8a02f561adb007e1c58058461f8c /guix
parentd264237d55ca5e2c756cc7a44374a7dbca850505 (diff)
import/cran: Also update annotation and experiment packages.
* guix/import/cran.scm (latest-bioconductor-release): Determine package type and pass it to LATEST-BIOCONDUCTOR-PACKAGE-VERSION and BIOCONDUCTOR-URI. (%bioconductor-updater): Compose all bioconductor predicates. Change-Id: Icef3ae05e28ed0f2796d9abf90e51821d2dfcc4c
Diffstat (limited to 'guix')
-rw-r--r--guix/import/cran.scm19
1 files changed, 16 insertions, 3 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 57a8e86fcb..d49bd96c9a 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -928,15 +928,25 @@ s-expression corresponding to that package, or #f on failure."
(define upstream-name
(package->upstream-name pkg))
+ (define type
+ (cond
+ ((bioconductor-data-package? pkg)
+ 'annotation)
+ ((bioconductor-experiment-package? pkg)
+ 'experiment)
+ ((bioconductor-package? pkg)
+ #true)
+ (else #false)))
+
(define latest-version
- (latest-bioconductor-package-version upstream-name))
+ (latest-bioconductor-package-version upstream-name type))
(and latest-version
;; Bioconductor does not provide signatures.
(upstream-source
(package (package-name pkg))
(version latest-version)
- (urls (bioconductor-uri upstream-name latest-version))
+ (urls (bioconductor-uri upstream-name latest-version type))
(inputs
(let ((meta (fetch-description 'bioconductor upstream-name)))
(cran-package-inputs meta 'bioconductor))))))
@@ -990,7 +1000,10 @@ s-expression corresponding to that package, or #f on failure."
(upstream-updater
(name 'bioconductor)
(description "Updater for Bioconductor packages")
- (pred bioconductor-package?)
+ (pred (lambda (pkg)
+ (or (bioconductor-package? pkg)
+ (bioconductor-data-package? pkg)
+ (bioconductor-experiment-package? pkg))))
(import latest-bioconductor-release)))
;;; cran.scm ends here