01/02: build-system/r: bioconductor-uri: Take optional package type.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit c586f427b4831b9b492e5b900b2226e898b8fcfa
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Aug 16 14:56:37 2019 +0200

    build-system/r: bioconductor-uri: Take optional package type.
    
    * guix/build-system/r.scm (bioconductor-uri): Take optional TYPE argument to
    return annotation or experiment URLs.
---
 guix/build-system/r.scm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index e721415..dd2a9fe 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -47,14 +47,22 @@ available via the first URI, the second URI points to the 
archived version."
         (string-append "mirror://cran/src/contrib/Archive/"
                        name "/" name "_" version ".tar.gz")))
 
-(define (bioconductor-uri name version)
+(define* (bioconductor-uri name version #:optional type)
   "Return a URI string for the R package archive on Bioconductor for the
 release corresponding to NAME and VERSION."
-  (list (string-append 
"https://bioconductor.org/packages/release/bioc/src/contrib/";
-                       name "_" version ".tar.gz")
-        ;; TODO: use %bioconductor-version from (guix import cran)
-        (string-append 
"https://bioconductor.org/packages/3.9/bioc/src/contrib/Archive/";
-                       name "_" version ".tar.gz")))
+  (let ((type-url-part (match type
+                         ('annotation "/data/annotation")
+                         ('experiment "/data/experiment")
+                         (_ "/bioc"))))
+    (list (string-append "https://bioconductor.org/packages/release";
+                         type-url-part
+                         "/src/contrib/"
+                         name "_" version ".tar.gz")
+          ;; TODO: use %bioconductor-version from (guix import cran)
+          (string-append "https://bioconductor.org/packages/3.9";
+                         type-url-part
+                         "/src/contrib/Archive/"
+                         name "_" version ".tar.gz"))))
 
 (define %r-build-system-modules
   ;; Build-side modules imported by default.