summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorSergey Trofimov <sarg@sarg.org.ru>2026-01-08 11:45:46 +0100
committerLudovic Courtès <ludo@gnu.org>2026-01-09 15:22:44 +0100
commita651926f552f8cde5231a789f663b2ac38827eec (patch)
treee7c6ef58ecf2f38aeba094aba98ab241a59dba22 /gnu
parentbb106f7b8561682648fd3b6c3a74e52bea14b388 (diff)
services: configuration: Generalize 'list-of-packages?'
* gnu/services/configuration.scm (list-of-packages?): Allow as well tuples of a package and its output. * gnu/home/services/sway.scm (list-of-packages): Remove duplicate. Change-Id: I42622a29ac808c76928e9056dee9330d5e1b3f39 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Merges: #5470
Diffstat (limited to 'gnu')
-rw-r--r--gnu/home/services/sway.scm3
-rw-r--r--gnu/services/configuration.scm5
2 files changed, 4 insertions, 4 deletions
diff --git a/gnu/home/services/sway.scm b/gnu/home/services/sway.scm
index 835053de1af..fcddbdbea20 100644
--- a/gnu/home/services/sway.scm
+++ b/gnu/home/services/sway.scm
@@ -129,9 +129,6 @@
(define (list-of-string-ish? lst)
(every string-ish? lst))
-(define (list-of-packages? lst)
- (every package? lst))
-
(define (bar-position? p)
(member p '(top bottom)))
diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
index 886847b9bb7..d42f04f1161 100644
--- a/gnu/services/configuration.scm
+++ b/gnu/services/configuration.scm
@@ -535,7 +535,10 @@ the list result in @code{#t} when applying PRED? on them."
#f)))
(define list-of-packages?
- (list-of package?))
+ (list-of (match-lambda
+ ((? package? pkg) #t)
+ (((? package? pkg) output) #t)
+ (_ #f))))
(define list-of-strings?
(list-of string?))