diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/services/configuration.scm | |
parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/services/configuration.scm')
-rw-r--r-- | gnu/services/configuration.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 6b0291dc00..174c2f20d2 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -34,6 +34,7 @@ #:autoload (texinfo) (texi-fragment->stexi) #:autoload (texinfo serialize) (stexi->texi) #:use-module (ice-9 curried-definitions) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -370,6 +371,8 @@ DEFAULT." (cond ((package? val) (symbol->string (package->symbol val))) + (((list-of package?) val) + (format #f "(~{~a~^ ~})" (map package->symbol val))) (else (str val)))) `(entry (% (heading @@ -437,10 +440,7 @@ the list result in @code{#t} when applying PRED? on them." (list-of string?)) (define alist? - (match-lambda - (() #t) - ((head . tail) (and (pair? head) (alist? tail))) - (_ #f))) + (list-of pair?)) (define serialize-file-like empty-serializer) |