gnu: %bootstrap-inputs-for-tests: Drop input labels.

* gnu/packages/bootstrap.scm (%bootstrap-inputs-for-tests): Drop input
labels.

* tests/union.scm ("union-build"): Rewrite input fetching accordingly.

Change-Id: I575a1cc43c4e4947648ae0dace38337e8855525d
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #8213

2 files changed, 9 insertions, 12 deletions

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 01053fb3e19..5555098973c 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -1010,10 +1010,9 @@ exec ~a/bin/~a -B~a/lib \
   ;; These are bootstrap inputs that are cheap to produce (no compilation
   ;; needed) and that are meant to be used for testing.  (These are those we
   ;; used before the Mes-based full-source bootstrap.)
-  `(("libc" ,%bootstrap-glibc)
-    ("gcc" ,%bootstrap-gcc)
-    ("binutils" ,%bootstrap-binutils)
-    ("coreutils&co" ,%bootstrap-coreutils&co)
-    ("bash" ,%bootstrap-coreutils&co)))
+  (list %bootstrap-glibc
+        %bootstrap-gcc
+        %bootstrap-binutils
+        %bootstrap-coreutils&co))
 
 ;;; bootstrap.scm ends here
diff --git a/tests/union.scm b/tests/union.scm
index a8387edf42e..51ab497383c 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -90,14 +90,12 @@
                1))
 
 (test-assert "union-build"
-  (let* ((inputs  (map (match-lambda
-                        ((name package)
-                         `(,name ,(package-derivation %store package))))
-
+  (let* ((inputs  (map (lambda (package)
+                         (list (package-name package)
+                               (package-derivation %store package)))
                        ;; Purposefully leave duplicate entries.
-                       (filter (compose package? cadr)
-                               (append %bootstrap-inputs-for-tests
-                                       (take %bootstrap-inputs-for-tests 3)))))
+                       (append %bootstrap-inputs-for-tests
+                               (take %bootstrap-inputs-for-tests 3))))
          (builder `(begin
                      (use-modules (guix build union))
                      (union-build (assoc-ref %outputs "out")