summaryrefslogtreecommitdiff
path: root/guix/import/cran.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2019-12-31 11:04:51 +0100
committerMathieu Othacehe <m.othacehe@gmail.com>2019-12-31 11:04:51 +0100
commitce9383c090fff90acb3a555d0ccfe12d791fef17 (patch)
tree7b9cce156799486b94e4f3e55b03831638e73465 /guix/import/cran.scm
parent91be09de61c277d0f1b26cefcefcd0a7fae2e00d (diff)
parentfc4eb87dc45b169e3912c73bbf60cb8ce76b7c7c (diff)
downloadguix-patches-ce9383c090fff90acb3a555d0ccfe12d791fef17.tar
guix-patches-ce9383c090fff90acb3a555d0ccfe12d791fef17.tar.gz
Merge remote-tracking branch 'master' into core-updates.
Diffstat (limited to 'guix/import/cran.scm')
-rw-r--r--guix/import/cran.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index d9018cc7da..f3f1747e43 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -82,6 +82,7 @@
("LGPL-2.1" 'lgpl2.1)
("LGPL-3" 'lgpl3)
("LGPL (>= 2)" 'lgpl2.0+)
+ ("LGPL (>= 2.1)" 'lgpl2.1+)
("LGPL (>= 3)" 'lgpl3+)
("MIT" 'expat)
("MIT + file LICENSE" 'expat)
@@ -132,9 +133,9 @@ package definition."
(define %cran-url "https://cran.r-project.org/web/packages/")
(define %bioconductor-url "https://bioconductor.org/packages/")
-;; The latest Bioconductor release is 3.9. Bioconductor packages should be
+;; The latest Bioconductor release is 3.10. Bioconductor packages should be
;; updated together.
-(define %bioconductor-version "3.9")
+(define %bioconductor-version "3.10")
(define* (bioconductor-packages-list-url #:optional type)
(string-append "https://bioconductor.org/packages/"