summaryrefslogtreecommitdiff
path: root/guix/import
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/import
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/import')
-rw-r--r--guix/import/cran.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 5622f759e0..ec2b7e6029 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -182,7 +182,7 @@ from ~s: ~a (~s)~%"
;; package's DESCRIPTION file over HTTP, so we determine the version,
;; download the source tarball, and then extract the DESCRIPTION file.
(let* ((version (latest-bioconductor-package-version name))
- (url (bioconductor-uri name version))
+ (url (car (bioconductor-uri name version)))
(tarball (with-store store (download-to-store store url))))
(call-with-temporary-directory
(lambda (dir)
@@ -469,7 +469,7 @@ dependencies."
(upstream-source
(package (package-name package))
(version version)
- (urls (list (bioconductor-uri upstream-name version))))))
+ (urls (bioconductor-uri upstream-name version)))))
(define (cran-package? package)
"Return true if PACKAGE is an R package from CRAN."