From e1457c467953b871d14214f6d617fdfea8ab15c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 9 Mar 2026 15:31:53 +0100 Subject: [PATCH] =?UTF-8?q?build-system/gnu:=20Avoid=20name=20clash=20in?= =?UTF-8?q?=20=E2=80=98package-with-explicit-inputs*=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- guix/build-system/gnu.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 8f0883956e..96b4fa1d39 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2024 Ludovic Courtès +;;; Copyright © 2012-2024, 2026 Ludovic Courtès ;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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)