~ruther/guix-local: gnu: gash-boot: Remove input labels.

6610c6cbfc5ab7805d9245f649ed7401598bd0a5 — Ludovic Courtès 1 year, 7 months ago 87f0ad6

gnu: gash-boot: Remove input labels.

* gnu/packages/commencement.scm (gash-boot)[arguments]: Use #:modules
instead of a non-top-level ‘use-modules’.  Turn #:phases into a gexp.
[inputs, native-inputs]: Remove labels.

Change-Id: I1e18b3ef76bb681494f76dded0dbd3b88cb9c462

patch browse .tar.gz .zip

1 files changed, 26 insertions(+), 23 deletions(-)

M gnu/packages/commencement.scm

M gnu/packages/commencement.scm => gnu/packages/commencement.scm +26 -23

@@ 205,29 205,32 @@ pure Scheme to Tar and decompression in one easy step.")
     (inherit gash)
     (name "gash-boot")
     (arguments
-     `(#:implicit-inputs? #f
-       #:tests? #f
-       #:guile ,%bootstrap-guile
-       #:imported-modules ((guix build gnu-bootstrap)
-                           ,@%default-gnu-imported-modules)
-       #:phases
-       (begin
-         (use-modules (guix build gnu-bootstrap))
-         (modify-phases %standard-phases
-           (replace 'configure
-             (bootstrap-configure "Gash" ,(package-version gash)
-                                  '("gash") "scripts"))
-           (replace 'build (bootstrap-build '("gash")))
-           (replace 'install (bootstrap-install '("gash") "scripts"))
-           (add-after 'install 'install-symlinks
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (symlink (string-append out "/bin/gash")
-                          (string-append out "/bin/sh"))
-                 (symlink (string-append out "/bin/gash")
-                          (string-append out "/bin/bash")))))))))
-    (inputs `(("guile" ,%bootstrap-guile)))
-    (native-inputs `(("bootar" ,bootar)))))
+     (list #:implicit-inputs? #f
+           #:tests? #f
+           #:guile %bootstrap-guile
+           #:imported-modules `((guix build gnu-bootstrap)
+                                ,@%default-gnu-imported-modules)
+           #:modules `((guix build gnu-bootstrap)
+                       ,@%default-gnu-modules)
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'configure
+                 (bootstrap-configure "Gash"
+                                      #$(package-version gash)
+                                      '("gash") "scripts"))
+               (replace 'build
+                 (bootstrap-build '("gash")))
+               (replace 'install
+                 (bootstrap-install '("gash") "scripts"))
+               (add-after 'install 'install-symlinks
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (symlink (string-append out "/bin/gash")
+                              (string-append out "/bin/sh"))
+                     (symlink (string-append out "/bin/gash")
+                              (string-append out "/bin/bash"))))))))
+    (inputs (list %bootstrap-guile))
+    (native-inputs (list bootar))))
 
 (define gash-utils-boot
   (package