aboutsummaryrefslogtreecommitdiff
path: root/tests/import-utils.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-12-11 10:52:58 +0100
committerLudovic Courtès <ludo@gnu.org>2019-12-11 12:13:03 +0100
commit70a8e13277d4a44b89dd9ee2290b98105f0235f1 (patch)
tree84117c573c1f352bfabaa2778c451ffdb4b30c7a /tests/import-utils.scm
parentddd59159004ca73c9449a27945116ff5069c3743 (diff)
downloadguix-70a8e13277d4a44b89dd9ee2290b98105f0235f1.tar
guix-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 'tests/import-utils.scm')
-rw-r--r--tests/import-utils.scm28
1 files changed, 13 insertions, 15 deletions
diff --git a/tests/import-utils.scm b/tests/import-utils.scm
index 3400433bbb..87dda3238f 100644
--- a/tests/import-utils.scm
+++ b/tests/import-utils.scm
@@ -24,7 +24,6 @@
#:use-module (guix packages)
#:use-module (guix build-system)
#:use-module (gnu packages)
- #:use-module (srfi srfi-41)
#:use-module (srfi srfi-64)
#:use-module (ice-9 match))
@@ -49,20 +48,19 @@
(package
(name "foo")
(inputs `(("bar" ,bar)))))
- (stream->list
- (recursive-import "foo" 'repo
- #:repo->guix-package
- (match-lambda*
- (("foo" 'repo)
- (values '(package
- (name "foo")
- (inputs `(("bar" ,bar))))
- '("bar")))
- (("bar" 'repo)
- (values '(package
- (name "bar"))
- '())))
- #:guix-name identity)))
+ (recursive-import "foo" 'repo
+ #:repo->guix-package
+ (match-lambda*
+ (("foo" 'repo)
+ (values '(package
+ (name "foo")
+ (inputs `(("bar" ,bar))))
+ '("bar")))
+ (("bar" 'repo)
+ (values '(package
+ (name "bar"))
+ '())))
+ #:guix-name identity))
(test-assert "alist->package with simple source"
(let* ((meta '(("name" . "hello")