01/01: test: Oops, syntax error and filter %bootstrap-inputs.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 703063e6c0b589879d3d20c17c3862076fdba54c
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sat Sep 22 16:55:59 2018 +0200

    test: Oops, syntax error and filter %bootstrap-inputs.
    
    This is a fixup of
    
        86811e6faf bootstrap: %bootstrap-inputs: Wrap input lists into thunks.
    
    * tests/builders.scm (%bootstrap-inputs): Oops, put parentheses in correct
    place.
    (%bootstrap-search-paths): Likewise.  Also, filter on package?.
---
 tests/builders.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/builders.scm b/tests/builders.scm
index 634c331..324e9d0 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -28,7 +28,8 @@
   #:use-module (gcrypt hash)
   #:use-module (guix tests)
   #:use-module ((guix packages)
-                #:select (package-derivation package-native-search-paths))
+                #:select (package?
+                          package-derivation package-native-search-paths))
   #:use-module (gnu packages bootstrap)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
@@ -47,14 +48,15 @@
        (map (match-lambda
              ((name package)
               (list name (package-derivation %store package))))
-            (@@ (gnu packages commencement) (%boot0-inputs)))))
+            ((@@ (gnu packages commencement) %boot0-inputs)))))
 
 (define %bootstrap-search-paths
   ;; Search path specifications that go with %BOOTSTRAP-INPUTS.
   (append-map (match-lambda
-               ((name package _ ...)
-                (package-native-search-paths package)))
-              (@@ (gnu packages commencement) (%boot0-inputs))))
+                ((name package _ ...)
+                 (package-native-search-paths package)))
+              (filter package?
+                      ((@@ (gnu packages commencement) %boot0-inputs)))))
 
 (define url-fetch*
   (store-lower url-fetch))