summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-10-14 18:38:46 +0200
committerLudovic Courtès <ludo@gnu.org>2015-10-14 21:39:06 +0200
commitc5d735f798e0e58774b9ce0c6197695bc6f0daa9 (patch)
treed9d95eb1023d25acd66bf1bb07fcea1bbe9a8041
parentd6c3267a32ae80b5a6f780a1678710ecc958b456 (diff)
downloadpatches-c5d735f798e0e58774b9ce0c6197695bc6f0daa9.tar
patches-c5d735f798e0e58774b9ce0c6197695bc6f0daa9.tar.gz
services: Prefix <dmd-service> accessors with 'dmd-'.
* gnu/services/dmd.scm (<dmd-service>): Prefix accessor identifiers with 'dmd-', as was intended. Update users accordingly.
-rw-r--r--gnu/services/dmd.scm35
1 files changed, 18 insertions, 17 deletions
diff --git a/gnu/services/dmd.scm b/gnu/services/dmd.scm
index 418511b289..7b6434a0ae 100644
--- a/gnu/services/dmd.scm
+++ b/gnu/services/dmd.scm
@@ -98,17 +98,17 @@ service that extends DMD-ROOT-SERVICE-TYPE and nothing else."
(define-record-type* <dmd-service>
dmd-service make-dmd-service
dmd-service?
- (documentation service-documentation ; string
+ (documentation dmd-service-documentation ;string
(default "[No documentation.]"))
- (provision service-provision) ; list of symbols
- (requirement service-requirement ; list of symbols
+ (provision dmd-service-provision) ;list of symbols
+ (requirement dmd-service-requirement ;list of symbols
(default '()))
- (respawn? service-respawn? ; Boolean
+ (respawn? dmd-service-respawn? ;Boolean
(default #t))
- (start service-start) ; g-expression (procedure)
- (stop service-stop ; g-expression (procedure)
+ (start dmd-service-start) ;g-expression (procedure)
+ (stop dmd-service-stop ;g-expression (procedure)
(default #~(const #f)))
- (auto-start? service-auto-start? ; Boolean
+ (auto-start? dmd-service-auto-start? ;Boolean
(default #t)))
@@ -127,8 +127,8 @@ failure."
(format #f (_ "service '~a' provided more than once")
symbol)))))))
- (for-each assert-unique (service-provision service))
- (fold set-insert set (service-provision service)))
+ (for-each assert-unique (dmd-service-provision service))
+ (fold set-insert set (dmd-service-provision service)))
(setq)
services))
@@ -160,12 +160,12 @@ failure."
(register-services
#$@(map (lambda (service)
#~(make <service>
- #:docstring '#$(service-documentation service)
- #:provides '#$(service-provision service)
- #:requires '#$(service-requirement service)
- #:respawn? '#$(service-respawn? service)
- #:start #$(service-start service)
- #:stop #$(service-stop service)))
+ #:docstring '#$(dmd-service-documentation service)
+ #:provides '#$(dmd-service-provision service)
+ #:requires '#$(dmd-service-requirement service)
+ #:respawn? '#$(dmd-service-respawn? service)
+ #:start #$(dmd-service-start service)
+ #:stop #$(dmd-service-stop service)))
services))
;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around it.
@@ -173,8 +173,9 @@ failure."
(format #t "starting services...~%")
(for-each start
- '#$(append-map service-provision
- (filter service-auto-start? services)))))
+ '#$(append-map dmd-service-provision
+ (filter dmd-service-auto-start?
+ services)))))
(gexp->file "dmd.conf" config)))