gnu: %boot4-inputs, %boot6-inputs: Drop input labels.

* gnu/packages/commencement.scm
(%boot4-inputs, %boot6-inputs): Drop input labels.
(with-boot4, with-boot6): Adapt accordingly.

Change-Id: Id0593d664e1ff1918eae6098d271e5b2b17fe934
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

1 files changed, 21 insertions, 28 deletions

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index bedf664c485..a6690995ab4 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3427,30 +3427,17 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
 
 (define (%boot4-inputs)
   ;; Now use the final Bash.
-  `(("bash" ,bash-final)
-    ("gcc" ,gcc-final)
-    ("ld-wrapper" ,ld-wrapper-boot3)
-    ("libc" ,glibc-final)
-    ("libc:static" ,glibc-final "static")
-    ("ld-wrapper-cross" ,ld-wrapper-boot0)
-    ("binutils-cross" ,binutils-boot0)
-    ,@(match (%current-system)
-        ((or "i686-linux" "x86_64-linux")
-         `(("bzip2" ,bzip2-boot0)
-           ("coreutils" ,coreutils-boot0)
-           ("gawk" ,gawk-boot0)
-           ("patch" ,patch-boot0)
-           ("sed" ,sed-boot0)
-           ("tar" ,tar-boot0)))
-        (_
-         `(("coreutils&co" ,%bootstrap-coreutils&co))))
-    ("make" ,gnu-make-boot0)
-    ("diffutils" ,diffutils-boot0)
-    ("findutils" ,findutils-boot0)
-    ("file" ,file-boot0)))
+  (cons* bash-final
+         (delete (%boot0-bash) (%boot3-inputs))))
 
 (define with-boot4
-  (package-with-explicit-inputs %boot4-inputs %bootstrap-guile))
+  (package-with-explicit-inputs
+   (lambda ()
+     (map (match-lambda
+            ((or (package . _) package)
+             (list (package-name package) package)))
+          (%boot4-inputs)))
+   %bootstrap-guile))
 
 (define-public guile-final
   ;; This package must be public because other modules refer to it.  However,
@@ -3561,14 +3548,20 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
 
 (define (%boot6-inputs)
   ;; Now use the final Coreutils.
-  `(("coreutils" ,coreutils-final)
-    ("grep" ,grep-final)
-    ("xz" ,xz-final)
-    ,@(fold alist-delete (%boot5-inputs)
-            '("coreutils" "xz"))))
+  (cons* coreutils-final
+         grep-final
+         xz-final
+         (fold delete
+               (%boot5-inputs)
+               (list coreutils-boot0 grep-mesboot xz-mesboot))))
 
 (define with-boot6
-  (package-with-explicit-inputs %boot6-inputs))
+  (package-with-explicit-inputs
+   (lambda ()
+     (map (match-lambda
+            ((or (package . _) package)
+             (list (package-name package) package)))
+          (%boot6-inputs)))))
 
 (define sed-final
   ;; The final sed.