gnu: guix: Drop input labels.

* gnu/packages/bootstrap.scm
(bootstrap-executable*): Add a file-name argument to the former
bootstrap-executable and rename from it.
(bootstrap-executable): New procedure, matching the API of the
previous procedure, and adding the file-name argument when absent and
needed.

* gnu/packages/package-management.scm (guix)[inputs]: Drop input labels.
[arguments]<#:phases>: In phase 'copy-bootstrap-guile, adapt input
selection and the intern procedure for this purpose.
(guix-daemon)[inputs]: Adapt input removal.

* tests/packages.scm (package-source-derivation, snippet): Adapt
bootstrap-guile-origin call.

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

1 files changed, 11 insertions, 4 deletions

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 0b4b29c833a..01053fb3e19 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -46,7 +46,8 @@
   #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-35)
   #:use-module (ice-9 match)
-  #:export (bootstrap-origin
+  #:export (bootstrap-guile-url-path
+            bootstrap-origin
             package-with-bootstrap-guile
             glibc-dynamic-linker
 
@@ -181,8 +182,8 @@
     (_ (string-append system "/" program
                       "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e"))))
 
-(define bootstrap-executable
-  (mlambda (program system)
+(define bootstrap-executable*
+  (mlambda (program system file-name)
     "Return an origin for PROGRAM, a statically-linked bootstrap executable
 built for SYSTEM."
     (let ((system (if (string=? system "x86_64-linux")
@@ -203,9 +204,15 @@ for system '~a'")
            (uri (map (cute string-append <>
                            (bootstrap-executable-file-name system program))
                      %bootstrap-executable-base-urls))
-           (file-name program)
+           ;; XXX: In the long term, migrate all boostrap executables to
+           ;; (string-append "bootstrap-" program), and drop the additional
+           ;; file-name argument.
+           (file-name file-name)
            (hash (content-hash bv sha256))))))))
 
+(define* (bootstrap-executable program system #:optional file-name)
+  (bootstrap-executable* program system (or file-name program)))
+
 
 ;;;
 ;;; Helper procedures.