From f14bb29defb36051039e977ba3791b542d90578a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 5 Feb 2020 08:26:08 +0100 Subject: [PATCH] =?UTF-8?q?import:=20cran:=20Use=20CRAN=E2=80=99s=20canoni?= =?UTF-8?q?cal=20URL=20as=20home-page.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/cran.scm (%cran-canonical-url): New variable. (description->package): Construct home-page using canonical URL. Signed-off-by: Christopher Baines --- guix/import/cran.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 1d25a5125e..9d38be7a1e 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -141,6 +141,7 @@ (define* (maybe-inputs package-inputs #:optional (type 'inputs)) `((,type (,'quasiquote ,(format-inputs package-inputs))))))) (define %cran-url "https://cran.r-project.org/web/packages/") +(define %cran-canonical-url "https://cran.r-project.org/package=") (define %bioconductor-url "https://bioconductor.org/packages/") ;; The latest Bioconductor release is 3.12. Bioconductor packages should be @@ -441,6 +442,10 @@ (define (description->package repository meta) ((bioconductor) %bioconductor-url) ((git) #f) ((hg) #f))) + (canonical-url-base (case repository + ((cran) %cran-canonical-url) + ((bioconductor) %bioconductor-url) + ((git) #f))) (uri-helper (case repository ((cran) cran-uri) ((bioconductor) bioconductor-uri) @@ -456,7 +461,7 @@ (define (description->package repository meta) ((hg) (assoc-ref meta 'hg)) (else (match (listify meta "URL") ((url rest ...) url) - (_ (string-append base-url name)))))) + (_ (string-append canonical-url-base name)))))) (source-url (case repository ((git) (assoc-ref meta 'git)) ((hg) (assoc-ref meta 'hg))