summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <ldb@leibniz-psychology.org>2020-02-05 08:26:08 +0100
committerGuix Patches Tester <>2020-02-05 07:51:10 +0000
commitc4933217fef2cf5ce7ed8911b50831a2d3ad4bf7 (patch)
tree5038d994ee9bc145f2d9fec8198cd3e2b258c866
parentb2a6a784003e0bb7f958666186522fbdf2356071 (diff)
downloadpatches-series-2808.tar
patches-series-2808.tar.gz
import: cran: Use CRAN’s canonical URL as home-pageseries-2808
* guix/import/cran.scm (%cran-canonical-url): New variable. (description->package): Construct home-page using canonical URL.
-rw-r--r--guix/import/cran.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index bcb37ed250..9f1214324c 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -134,6 +134,7 @@ package definition."
`((,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.10. Bioconductor packages should be
@@ -402,6 +403,10 @@ from the alist META, which was derived from the R package's DESCRIPTION file."
((cran) %cran-url)
((bioconductor) %bioconductor-url)
((git) #f)))
+ (canonical-url (case repository
+ ((cran) %cran-canonical-url)
+ ((bioconductor) %bioconductor-url)
+ ((git) #f)))
(uri-helper (case repository
((cran) cran-uri)
((bioconductor) bioconductor-uri)
@@ -415,7 +420,7 @@ from the alist META, which was derived from the R package's DESCRIPTION file."
((git) (assoc-ref meta 'git))
(else (match (listify meta "URL")
((url rest ...) url)
- (_ (string-append base-url name))))))
+ (_ (string-append canonical-url name))))))
(source-url (case repository
((git) (assoc-ref meta 'git))
(else