[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#63985] [PATCH v3 07/11] services: configuration: Add some commonly
From: |
Bruno Victal |
Subject: |
[bug#63985] [PATCH v3 07/11] services: configuration: Add some commonly used predicates. |
Date: |
Mon, 26 Jun 2023 22:59:33 +0100 |
* gnu/services/configuration.scm (list-of-packages?, list-of-symbols?): New
predicate.
* gnu/services/audio.scm (list-of-symbol?): Remove.
* gnu/services/telephony.scm (string-list?): Remove.
(serialize-string-list): Rename to …
(serialize-list-of-strings): … this.
(account-fingerprint-list?, jami-account-list?): Use list-of.
* doc/guix.texi: Update it.
---
doc/guix.texi | 4 ++--
gnu/services/audio.scm | 7 ++-----
gnu/services/configuration.scm | 16 ++++++++++++++++
gnu/services/telephony.scm | 20 +++++++-------------
4 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 14802e9366..2f7e734874 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27850,7 +27850,7 @@ Telephony Services
connection to the Internet has been lost. When left unspecified,
the value from the account archive prevails.
-@item @code{bootstrap-hostnames} (type: maybe-string-list)
+@item @code{bootstrap-hostnames} (type: maybe-list-of-strings)
A list of hostnames or IPs pointing to OpenDHT nodes, that should be
used to initially join the OpenDHT network. When left unspecified, the
value from the account archive prevails.
@@ -34244,7 +34244,7 @@ Audio Services
The group to run mpd as.
The default @code{%mpd-group} is a system group with name ``mpd''.
-@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbol)
+@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbols)
A list of symbols naming Shepherd services that this service
will depend on.
diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm
index 690409b7a1..89ab9c51c6 100644
--- a/gnu/services/audio.scm
+++ b/gnu/services/audio.scm
@@ -137,9 +137,6 @@ (define (uglify-field-name field-name)
str)
#\-) "_")))
-(define list-of-symbol?
- (list-of symbol?))
-
;; Helpers for deprecated field types, to be removed later.
(define %lazy-group (make-symbol "%lazy-group"))
@@ -413,7 +410,7 @@ (define-configuration mpd-configuration
(sanitizer mpd-group-sanitizer))
(shepherd-requirement
- (list-of-symbol '())
+ (list-of-symbols '())
"This is a list of symbols naming Shepherd services that this service
will depend on."
empty-serializer)
@@ -711,7 +708,7 @@ (define-configuration/no-serialization mympd-configuration
empty-serializer)
(shepherd-requirement
- (list-of-symbol '())
+ (list-of-symbols '())
"This is a list of symbols naming Shepherd services that this service
will depend on."
empty-serializer)
diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
index 4eee5a26c2..fd9130b1ea 100644
--- a/gnu/services/configuration.scm
+++ b/gnu/services/configuration.scm
@@ -81,7 +81,9 @@ (define-module (gnu services configuration)
interpose
list-of
+ list-of-packages?
list-of-strings?
+ list-of-symbols?
alist?
serialize-file-like
text-config?
@@ -508,6 +510,10 @@ (define* (interpose ls #:optional (delimiter "\n")
(grammar 'infix))
(cons delimiter acc))))
'() ls))
+
+;;;
+;;; Commonly used predicates
+
(define (list-of pred?)
"Return a procedure that takes a list and check if all the elements of
the list result in @code{#t} when applying PRED? on them."
@@ -516,10 +522,20 @@ (define (list-of pred?)
(every pred? x)
#f)))
+(define list-of-packages?
+ (list-of package?))
(define list-of-strings?
(list-of string?))
+(define list-of-symbols?
+ (list-of symbol?))
+
+
+;;;
+;;; Special serializers
+;;;
+
(define alist?
(list-of pair?))
diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm
index 56b7772f58..c9b5d6cd99 100644
--- a/gnu/services/telephony.scm
+++ b/gnu/services/telephony.scm
@@ -117,15 +117,10 @@ (define (string-or-computed-file? val)
(or (string? val)
(computed-file? val)))
-(define (string-list? val)
- (and (list? val)
- (and-map string? val)))
+(define account-fingerprint-list?
+ (list-of account-fingerprint?))
-(define (account-fingerprint-list? val)
- (and (list? val)
- (and-map account-fingerprint? val)))
-
-(define-maybe string-list)
+(define-maybe list-of-strings)
(define-maybe/no-serialization account-fingerprint-list)
@@ -135,7 +130,7 @@ (define-maybe string)
;;; The following serializers are used to derive an account details alist from
;;; a <jami-account> record.
-(define (serialize-string-list _ val)
+(define (serialize-list-of-strings _ val)
(string-join val ";"))
(define (serialize-boolean _ val)
@@ -188,7 +183,7 @@ (define-configuration jami-account
connection to the the Internet has been lost. When left unspecified, the
value from the account archive prevails.")
(bootstrap-hostnames
- maybe-string-list
+ maybe-list-of-strings
"A list of hostnames or IPs pointing to OpenDHT nodes, that should be used
to initially join the OpenDHT network. When left unspecified, the value from
the account archive prevails.")
@@ -220,9 +215,8 @@ (define (jami-account->alist jami-account-object)
(list-transduce jami-account-transducer rcons jami-account-fields))
-(define (jami-account-list? val)
- (and (list? val)
- (and-map jami-account? val)))
+(define jami-account-list?
+ (list-of jami-account?))
(define-maybe/no-serialization jami-account-list)
--
2.39.2
- [bug#63985] [PATCH RFC 5/5] services: configuration: New generic-ini module., (continued)
- [bug#63985] [PATCH RFC 5/5] services: configuration: New generic-ini module., Bruno Victal, 2023/06/09
- [bug#63985] [PATCH RFC 4/5] services: configuration: Add serializer-kwargs field., Bruno Victal, 2023/06/09
- [bug#63985] [PATCH RFC v2 1/5] services: configuration: Simplify normalize-extra-args., Bruno Victal, 2023/06/10
- [bug#63985] [PATCH RFC v2 3/5] services: fstrim-service-type: Serialize with SRFI-171 transducers., Bruno Victal, 2023/06/10
- [bug#63985] [PATCH RFC v2 2/5] services: configuration: Use transducers within serialize-configuration., Bruno Victal, 2023/06/10
- [bug#63985] [PATCH RFC v2 4/5] services: configuration: Add serializer-options field., Bruno Victal, 2023/06/10
- [bug#63985] [PATCH RFC v2 5/5] services: configuration: New generic-ini module., Bruno Victal, 2023/06/10
- [bug#63985] [PATCH v3 00/11] Service subsystem improvements, Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 06/11] services: configuration: New generic-ini module., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 11/11] services: NetworkManager: Add extra-options field., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 07/11] services: configuration: Add some commonly used predicates.,
Bruno Victal <=
- [bug#63985] [PATCH v3 05/11] services: configuration: Add serializer-options field., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 10/11] services: NetworkManager: add log-configuration field., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 09/11] services: NetworkManager: Prefer package over network-manager., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 03/11] services: fstrim-service-type: Serialize with SRFI-171 transducers., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 08/11] services: NetworkManager: Use define-configuration and generic-ini., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 04/11] doc: Rewrite define-configuration., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 02/11] services: configuration: Use transducers within serialize-configuration., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 01/11] services: configuration: Simplify normalize-extra-args., Bruno Victal, 2023/06/26
- [bug#63985] [PATCH v3 00/11] Service subsystem improvements, Liliana Marie Prikler, 2023/06/27