From 49232eff56c4dcf0f0557c5ddf5b252f8373370a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 5 May 2024 12:02:59 +0200 Subject: packages: ‘sanitize-inputs’ does not add labels when unnecessary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a bug introduced in 402d0a9b9d290a2e3c549932c8d7262622c58ce1 whereby labels would be added in cases like: (inputs (list `("label" ,whatever))) This idiom is found for example in the ‘nmon’ package. * guix/packages.scm (add-input-labels): Call ‘maybe-add-input-labels’ instead of (map add-input-label …). Change-Id: I3e86d4607f19482a4e461ef8e7a20cde2a41ead7 --- guix/packages.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 4385e4f930..abe89cdb07 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -439,8 +439,9 @@ from forcing GEXP-PROMISE." (else (map add-input-label inputs)))) (define (add-input-labels . inputs) - "Add labels to all of INPUTS." - (map add-input-label inputs)) + "Add labels to all of INPUTS if needed (this is the rest-argument version of +'maybe-add-input-labels')." + (maybe-add-input-labels inputs)) (define-syntax sanitize-inputs ;; This is written as a macro rather than as a 'define-inlinable' procedure -- cgit v1.2.3