tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

build-system/gnu: Avoid name clash in ‘package-with-explicit-inputs*’.

Browse Source 
With the next commit, ‘inputs’ is bound within the body of the ‘inputs’ field,
which would shadow the ‘inputs’ parameter of ‘package-with-explicit-inputs*’.

* guix/build-system/gnu.scm (package-with-explicit-inputs*): Rename ‘inputs’
parameter to ‘explicit-inputs’ to avoid name class in ‘add-explicit-inputs’.

Change-Id: I5aa70504cc6ffc856728c6e1a715ef68d9ebd7d9
This commit is contained in:
Ludovic Courtès
2026-03-09 15:31:53 +01:00
parent 3cf8ff32f2
commit e1457c4679
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build-system/gnu.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012-2024, 2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -137,11 +137,11 @@ builder, or the distro's final Guile when GUILE is #f."
,@(map rewritten-input
(filtered (package-inputs p)))))))))
(define* (package-with-explicit-inputs* inputs #:optional guile)
(define* (package-with-explicit-inputs* explicit-inputs #:optional guile)
"Return a procedure that rewrites the given package and all its dependencies
so that they use INPUTS (a thunk) instead of implicit inputs."
so that they use EXPLICIT-INPUTS (a thunk) instead of implicit inputs."
(define (duplicate-filter package-inputs)
(let ((names (match (inputs)
(let ((names (match (explicit-inputs)
(((name _ ...) ...)
name))))
(fold alist-delete package-inputs names)))
@@ -151,7 +151,7 @@ so that they use INPUTS (a thunk) instead of implicit inputs."
(not (memq #:implicit-inputs? (package-arguments p))))
(package
(inherit p)
(inputs (append (inputs)
(inputs (append (explicit-inputs)
(duplicate-filter (package-inputs p))))
(arguments
(ensure-keyword-arguments (package-arguments p)