guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 5a02f4458b70dcf71b776320bbaa0a9d68e3ee3a
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Nov 16 12:04:12 2026 +0100
Use ‘modify-inputs’ rather than ‘alist-replace’.
* gnu/packages/embedded.scm (make-arm-none-eabi-toolchain): Use
‘modify-inputs’ instead of ‘alist-replace’.
* gnu/packages/golang.scm (go-1.20, go-1.22, go-1.24, go-1.26): Likewise.
* gnu/packages/guile-xyz.scm (guile2.0-lib, guile2.2-lib): Likewise.
* gnu/packages/java.scm (antlr4-4.1, java-tunnelvisionlabs-antlr4-runtime)
(java-tunnelvisionlabs-antlr4): Likewise.
Signed-off-by: Ludovic Courtès <[email protected]>
Merges: #12592
---
gnu/packages/embedded.scm | 6 ++----
gnu/packages/golang.scm | 16 ++++++++++------
gnu/packages/guile-xyz.scm | 17 ++++++++---------
gnu/packages/java.scm | 17 ++++++-----------
4 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index b3765e7f0a7..0f3c90f7f47 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -56,7 +56,6 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system trivial)
- #:use-module ((guix build utils) #:select (alist-replace
delete-file-recursively))
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
@@ -806,9 +805,8 @@ C library variant NEWLIB."
(newlib-with-xgcc
(package
(inherit newlib)
- (native-inputs
- (alist-replace "xgcc" (list xgcc)
- (package-native-inputs newlib)))))
+ (native-inputs (modify-inputs native-inputs
+ (replace "xgcc" xgcc)))))
(libstdc++
(if nano?
(make-libstdc++-nano-arm-none-eabi xgcc newlib-with-xgcc)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6e900199340..8f92d46734e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -70,7 +70,6 @@
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix memoization)
- #:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
@@ -650,8 +649,10 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
;; We continue to use gccgo-12 since it provides go-1.18.
;; We remove gold since it causes test failures on aarch64-linux.
(if (member (%current-system) (package-supported-systems go-1.4))
- (alist-replace "go" (list go-1.17) (package-native-inputs go-1.17))
- (alist-delete "gold" (package-native-inputs go-1.17))))
+ (modify-inputs native-inputs
+ (replace "go" go-1.17))
+ (modify-inputs native-inputs
+ (delete "gold"))))
(properties
`((hidden? . #t) ;for bootstrap only
(compiler-cpu-architectures
@@ -842,7 +843,8 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
((".*tsan1[34].*") ""))))))))
(native-inputs
;; Go 1.22 and later requires Go 1.20 as the bootstrap toolchain.
- (alist-replace "go" (list go-1.20) (package-native-inputs go-1.20)))))
+ (modify-inputs native-inputs
+ (replace "go" go-1.20)))))
(define %go-1.23-arm64-micro-architectures
;; https://go.dev/wiki/MinimumRequirements#arm64
@@ -899,7 +901,8 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(else (list #t)))))))))
(native-inputs
;; Go 1.24 and later requires Go 1.22+ as the bootstrap toolchain.
- (alist-replace "go" (list go-1.22) (package-native-inputs go-1.22)))
+ (modify-inputs native-inputs
+ (replace "go" go-1.22)))
(properties
`((hidden? . #t) ;for bootstrap only
(compiler-cpu-architectures
@@ -1006,7 +1009,8 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(string-append all "\n
t.Skip(\"golang.org/issue/73977\")\n")))))))))
(native-inputs
;; Go 1.26 and later requires Go 1.24.6+ as the bootstrap toolchain.
- (alist-replace "go" (list go-1.24) (package-native-inputs go-1.25)))
+ (modify-inputs native-inputs
+ (replace "go" go-1.24)))
(properties
(alist-delete 'hidden? (package-properties go-1.24)))))
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index cf3794ccbfe..2144a10f26b 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -167,7 +167,6 @@
#:use-module (guix build-system guile)
#:use-module (guix build-system meson)
#:use-module (guix utils)
- #:use-module ((guix build utils) #:select (alist-replace))
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (alist-delete))
#:use-module (srfi srfi-26))
@@ -4089,22 +4088,22 @@ available:
;; This test uses (ice-9 textual-ports), which does not exist on 2.0.
(list #:make-flags #~(list "XFAIL_TESTS=logging.logger.scm")))
(native-inputs
- (alist-replace "guile" (list guile-2.0)
- (package-native-inputs guile-lib)))
+ (modify-inputs native-inputs
+ (replace "guile" guile-2.0)))
(inputs
- (alist-replace "guile" (list guile-2.0)
- (package-inputs guile-lib)))))
+ (modify-inputs inputs
+ (replace "guile" guile-2.0)))))
(define-public guile2.2-lib
(package
(inherit guile-lib)
(name "guile2.2-lib")
(native-inputs
- (alist-replace "guile" (list guile-2.2)
- (package-native-inputs guile-lib)))
+ (modify-inputs native-inputs
+ (replace "guile" guile-2.2)))
(inputs
- (alist-replace "guile" (list guile-2.2)
- (package-inputs guile-lib)))))
+ (modify-inputs inputs
+ (replace "guile" guile-2.2)))))
(define-public guile-minikanren
(package
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index ca67700413a..47290345015 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -89,7 +89,6 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
- #:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix build-system ant)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -10312,9 +10311,8 @@ parse trees.")))
(delete 'remove-unrelated-languages)
(delete 'generate-test-parsers)))))
(inputs
- (alist-replace
- "java-antlr4-runtime" (list java-antlr4-runtime-4.1)
- (package-inputs antlr4)))))
+ (modify-inputs inputs
+ (replace "java-antlr4-runtime" java-antlr4-runtime-4.1)))))
(define-public java-tunnelvisionlabs-antlr4-runtime-annotations
(package
@@ -10429,10 +10427,8 @@ the runtime library of ANTLR.")))
(package
(inherit java-tunnelvisionlabs-antlr4-runtime-bootstrap)
(native-inputs
- (alist-replace
- "antlr4" (list java-tunnelvisionlabs-antlr4-bootstrap)
- (package-native-inputs
- java-tunnelvisionlabs-antlr4-runtime-bootstrap)))
+ (modify-inputs native-inputs
+ (replace "antlr4" java-tunnelvisionlabs-antlr4-bootstrap)))
(properties
(alist-delete
'hidden?
@@ -10442,9 +10438,8 @@ the runtime library of ANTLR.")))
(package
(inherit java-tunnelvisionlabs-antlr4-bootstrap)
(inputs
- (alist-replace
- "java-antlr4-runtime" (list java-tunnelvisionlabs-antlr4-runtime)
- (package-inputs java-tunnelvisionlabs-antlr4-bootstrap)))
+ (modify-inputs inputs
+ (replace "java-antlr4-runtime" java-tunnelvisionlabs-antlr4-runtime)))
(properties
(alist-delete
'hidden?