summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-05-05 12:02:59 +0200
committerLudovic Courtès <ludo@gnu.org>2024-05-05 12:06:23 +0200
commit49232eff56c4dcf0f0557c5ddf5b252f8373370a (patch)
tree832e2ca9d3696bec343aed84db8ee40d2a7a17e4
parentef8ab6ab66c4d629699d175938ef1912941d4dce (diff)
downloadguix-patches-49232eff56c4dcf0f0557c5ddf5b252f8373370a.tar
guix-patches-49232eff56c4dcf0f0557c5ddf5b252f8373370a.tar.gz
packages: ‘sanitize-inputs’ does not add labels when unnecessary.
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
-rw-r--r--guix/packages.scm5
1 files 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