From 25e51b1c45374ca0dd1898fd5acaefe4fc3cd815 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Nov 2017 17:49:47 +0100 Subject: 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. --- guix/import/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix/import') 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." -- cgit v1.2.3