aboutsummaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-11-06 17:49:47 +0100
committerRicardo Wurmus <rekado@elephly.net>2017-11-07 08:14:09 +0100
commit25e51b1c45374ca0dd1898fd5acaefe4fc3cd815 (patch)
tree948a32535dbb9d0df88add02eb19a8dca8217110 /guix/build-system
parent27baf509569392dc4c15906eb848c8313a818c9e (diff)
downloadgnu-guix-25e51b1c45374ca0dd1898fd5acaefe4fc3cd815.tar
gnu-guix-25e51b1c45374ca0dd1898fd5acaefe4fc3cd815.tar.gz
guix: Add archive support for bioconductor-uri.
* guix/build-system/r.scm (bioconductor-uri): Also return the archive URL. * guix/import/cran.scm (latest-bioconductor-release, fetch-description): Adjust because bioconductor-uri now returns a list.
Diffstat (limited to 'guix/build-system')
-rw-r--r--guix/build-system/r.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index 2c8a89f8de..6bdb7061eb 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -50,8 +50,11 @@ available via the first URI, the second URI points to the archived version."
(define (bioconductor-uri name version)
"Return a URI string for the R package archive on Bioconductor for the
release corresponding to NAME and VERSION."
- (string-append "https://bioconductor.org/packages/release/bioc/src/contrib/"
- name "_" version ".tar.gz"))
+ (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.6/bioc/src/contrib/Archive/"
+ name "_" version ".tar.gz")))
(define %r-build-system-modules
;; Build-side modules imported by default.