[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
287/290: gnu: gash-boot: Remove input labels.
From: |
guix-commits |
Subject: |
287/290: gnu: gash-boot: Remove input labels. |
Date: |
Sun, 30 Mar 2025 10:24:25 -0400 (EDT) |
andreas pushed a commit to branch core-packages-team
in repository guix.
commit 5e3b9d77d68f971bee2290ad71e06bbc85118ab0
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Mar 23 01:16:17 2025 +0100
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
---
gnu/packages/commencement.scm | 49 +++++++++++++++++++++++--------------------
1 file 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
- 199/290: gnu: pidgin: Fix build with gcc-14., (continued)
- 199/290: gnu: pidgin: Fix build with gcc-14., guix-commits, 2025/03/30
- 230/290: gnu: libatomic-ops: Update to 7.8.2., guix-commits, 2025/03/30
- 257/290: gnu: bash-static: Fix cross-compiling for glibc@2.41., guix-commits, 2025/03/30
- 205/290: gnu: icedtea-7: Fix build with gcc-14., guix-commits, 2025/03/30
- 216/290: gnu: clang-runtime-18: Build with gcc-12., guix-commits, 2025/03/30
- 217/290: gnu: clang-runtime-18: Build with gcc-13., guix-commits, 2025/03/30
- 180/290: gnu: Add autoconf-2.72., guix-commits, 2025/03/30
- 254/290: gnu: glib: Update to 2.83.3. Fix test for tzdata@2025a., guix-commits, 2025/03/30
- 270/290: gnu: linux-libre-headers: Update to 6.12.17., guix-commits, 2025/03/30
- 277/290: Revert "gnu: which: Update to 2.22.", guix-commits, 2025/03/30
- 287/290: gnu: gash-boot: Remove input labels.,
guix-commits <=
- 290/290: gnu: mpfr: Update to 4.2.2., guix-commits, 2025/03/30
- 281/290: gnu: minizip: Remove phase 'remove-crypt-h., guix-commits, 2025/03/30
- 39/290: gnu: jack-1: Fix build with gcc-14., guix-commits, 2025/03/30
- 36/290: gnu: fontforge: Update to 20230101 and fix build with gettext-0.23., guix-commits, 2025/03/30
- 50/290: gnu: python-numpy: Update to 1.26.4 and fix build with gcc-14., guix-commits, 2025/03/30
- 57/290: gnu: netdde: Use -Wno-error=., guix-commits, 2025/03/30
- 15/290: gnu: automake: Update to 1.17; fixes build with gcc-14., guix-commits, 2025/03/30
- 19/290: gnu: elfutils: Update to 0.192; fixes build with gcc-14., guix-commits, 2025/03/30
- 23/290: gnu: guile-lzlib: Fix build with gcc-14., guix-commits, 2025/03/30
- 25/290: gnu: python-lxml: Update to 5.2.2; fixes build with gcc-14., guix-commits, 2025/03/30