diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-03-23 01:16:17 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-03-31 10:48:06 +0200 |
| commit | a54f154ba47460c3e336bd6e703e34892267e43b (patch) | |
| tree | 720a7bc116ad56a4d3de6c66333db2f1dffe506e | |
| parent | ea8e685806d840fea8fa681c146bd0dff5b75a69 (diff) | |
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
| -rw-r--r-- | gnu/packages/commencement.scm | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1d8d871865..3304b57c4d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -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 |