~ruther/guix-local: services: configuration: Generalize 'list-of-packages?'

a651926f552f8cde5231a789f663b2ac38827eec — Sergey Trofimov 3 months ago bb106f7

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

patch browse .tar.gz

2 files changed, 4 insertions(+), 4 deletions(-)

M gnu/home/services/sway.scm
M gnu/services/configuration.scm

M gnu/home/services/sway.scm => gnu/home/services/sway.scm +0 -3

@@ 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)))

M gnu/services/configuration.scm => gnu/services/configuration.scm +4 -1

@@ 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?))