diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-12-11 10:52:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-12-11 12:13:03 +0100 |
| commit | 70a8e13277d4a44b89dd9ee2290b98105f0235f1 (patch) | |
| tree | 84117c573c1f352bfabaa2778c451ffdb4b30c7a /guix/import/utils.scm | |
| parent | ddd59159004ca73c9449a27945116ff5069c3743 (diff) | |
| download | guix-patches-70a8e13277d4a44b89dd9ee2290b98105f0235f1.tar guix-patches-70a8e13277d4a44b89dd9ee2290b98105f0235f1.tar.gz | |
import: utils: 'recursive-import' returns a list rather than a stream.
* guix/import/utils.scm (recursive-import): Remove 'list->stream' call.
* guix/scripts/import/cran.scm (guix-import-cran): Remove 'stream->list'
call.
* guix/scripts/import/crate.scm (guix-import-crate): Likewise.
* guix/scripts/import/elpa.scm (guix-import-elpa): Likewise.
* guix/scripts/import/gem.scm (guix-import-gem): Likewise.
* guix/scripts/import/hackage.scm (guix-import-hackage): Likewise.
* guix/scripts/import/opam.scm (guix-import-opam): Likewise.
* guix/scripts/import/pypi.scm (guix-import-pypi): Likewise.
* guix/scripts/import/stackage.scm (guix-import-stackage): Likewise.
* tests/gem.scm ("gem-recursive-import"): Likewise.
* tests/import-utils.scm ("recursive-import"): Likewise.
Co-authored-by: Brian Leung <bkleung89@gmail.com>
Diffstat (limited to 'guix/import/utils.scm')
| -rw-r--r-- | guix/import/utils.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/guix/import/utils.scm b/guix/import/utils.scm index ef7c13259d..47fc8276a9 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -44,7 +44,6 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-41) #:export (factorize-uri flatten @@ -422,11 +421,10 @@ name corresponding to the upstream name." (receive (package dependencies) (repo->guix-package name repo) (make-node name package dependencies))) - (list->stream ;TODO: remove streams - (map node-package - (topological-sort (list (lookup-node package-name)) - (lambda (node) - (map lookup-node - (remove exists? - (node-dependencies node)))) - node-name)))) + (map node-package + (topological-sort (list (lookup-node package-name)) + (lambda (node) + (map lookup-node + (remove exists? + (node-dependencies node)))) + node-name))) |