diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
| commit | e90e0fad1b3ba79d81f02424e143ee6f4f736e8b (patch) | |
| tree | 2c26190fd9114199b0ef79303e18a61100cab4af /gnu/services/messaging.scm | |
| parent | 8ea0700d231a8819fc7e8332e9685f0ce15c174e (diff) | |
| parent | 9ec2a4d3fec44f08a55df9f5f3d1a04b83e7fcf6 (diff) | |
| download | guix-e90e0fad1b3ba79d81f02424e143ee6f4f736e8b.tar guix-e90e0fad1b3ba79d81f02424e143ee6f4f736e8b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/messaging.scm')
| -rw-r--r-- | gnu/services/messaging.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 9f59d6eac6..34723dc11c 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -49,8 +49,9 @@ ;;; ;;; Code: -(define (id ctx . parts) - (datum->syntax ctx (apply symbol-append (map syntax->datum parts)))) +(define-syntax-rule (id ctx parts ...) + "Assemble PARTS into a raw (unhygienic) identifier." + (datum->syntax ctx (symbol-append (syntax->datum parts) ...))) (define-syntax define-maybe (lambda (x) @@ -94,21 +95,21 @@ "" doc)) #'(doc ...) #'(target ...)))) #`(begin - (define common-fields + (define #,(id #'stem #'common-fields) '(#,@(filter-map (make-pred #f) #'(field ...) #'(target ...)))) - (define-configuration prosody-configuration + (define-configuration #,(id #'stem #'prosody-configuration) #,@(filter-map (make-pred 'global) #'((field (field-type def) doc) ...) #'(target ...))) - (define-configuration virtualhost-configuration + (define-configuration #,(id #'stem #'virtualhost-configuration) #,@(filter-map (make-pred 'virtualhost) #'((field (new-field-type new-def) new-doc) ...) #'(target ...))) - (define-configuration int-component-configuration + (define-configuration #,(id #'stem #'int-component-configuration) #,@(filter-map (make-pred 'int-component) #'((field (new-field-type new-def) new-doc) ...) #'(target ...))) - (define-configuration ext-component-configuration + (define-configuration #,(id #'stem #'ext-component-configuration) #,@(filter-map (make-pred 'ext-component) #'((field (new-field-type new-def) new-doc) ...) #'(target ...))))))))) |