diff options
author | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
commit | 893c2df00daa4e6dd6a7ff3813d7df5329877f9e (patch) | |
tree | acd0db459464acae47083b66d5ce12cc656e2f10 /guix/build-system | |
parent | 04b9b7bb05aff4c41f46cd79aa7bc953ace16e86 (diff) | |
parent | 0ccc9a0f5bb89b239d56157ea66f8420fcec5ba6 (diff) | |
download | gnu-guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar gnu-guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build-system')
-rw-r--r-- | guix/build-system/r.scm | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index e7214155be..dd2a9fe8de 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. |