From 70a8e13277d4a44b89dd9ee2290b98105f0235f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 11 Dec 2019 10:52:58 +0100
Subject: 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>
---
 tests/import-utils.scm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'tests/import-utils.scm')

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")
-- 
cgit v1.2.3