diff options
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/cran.scm | 5 | ||||
| -rw-r--r-- | guix/import/utils.scm | 2 |
2 files changed, 4 insertions, 3 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/" diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 47fc8276a9..d17d400ddf 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -402,7 +402,7 @@ obtain a node's uniquely identifying \"key\"." (define* (recursive-import package-name repo #:key repo->guix-package guix-name #:allow-other-keys) - "Return a stream of package expressions for PACKAGE-NAME and all its + "Return a list of package expressions for PACKAGE-NAME and all its dependencies, sorted in topological order. For each package, call (REPO->GUIX-PACKAGE NAME REPO), which should return a package expression and a list of dependencies; call (GUIX-NAME NAME) to obtain the Guix package |