me
/
guix
Archived
1
0
Fork 0

services: dmd: Add 'modules' and 'imported-modules' fields.

* gnu/services/dmd.scm (%default-imported-modules, %default-modules):
New variables.
* gnu/services/dmd.scm (<dmd-service>)[modules, imported-modules]: New
field.
* gnu/services/dmd.scm (dmd-service-file-name, dmd-service-file): New
procedures.
(dmd-configuration-file)[modules]: Compute based on the
'imported-modules' field of SERVICES.
(dmd-configuration-file): Remove 'use-modules' form.  Use
'dmd-service-file', and call 'primitive-load' on each file.
* doc/guix.texi (dmd Services): Document the new fields.
master
Ludovic Courtès 2015-11-25 10:46:02 +01:00
parent 851b6f6283
commit fae685b9cc
2 changed files with 67 additions and 23 deletions

View File

@ -8068,6 +8068,15 @@ deco doc @var{service-name}
where @var{service-name} is one of the symbols in @var{provision} where @var{service-name} is one of the symbols in @var{provision}
(@pxref{Invoking deco,,, dmd, GNU dmd Manual}). (@pxref{Invoking deco,,, dmd, GNU dmd Manual}).
@item @code{modules} (default: @var{%default-modules})
This is the list of modules that must be in scope when @code{start} and
@code{stop} are evaluated.
@item @code{imported-modules} (default: @var{%default-imported-modules})
This is the list of modules to import in the execution environment of
dmd.
@end table @end table
@end deftp @end deftp

View File

@ -45,6 +45,11 @@
dmd-service-start dmd-service-start
dmd-service-stop dmd-service-stop
dmd-service-auto-start? dmd-service-auto-start?
dmd-service-modules
dmd-service-imported-modules
%default-imported-modules
%default-modules
dmd-service-back-edges)) dmd-service-back-edges))
@ -99,6 +104,22 @@ service that extends DMD-ROOT-SERVICE-TYPE and nothing else."
(list (service-extension dmd-root-service-type (list (service-extension dmd-root-service-type
(compose list proc)))))) (compose list proc))))))
(define %default-imported-modules
;; Default set of modules imported for a service's consumption.
'((guix build utils)
(guix build syscalls)
(gnu build file-systems)))
(define %default-modules
;; Default set of modules visible in a service's file.
`((dmd service)
(oop goops)
(ice-9 ftw)
(guix build utils)
(guix build syscalls)
((gnu build file-systems)
#:select (check-file-system canonicalize-device-spec))))
(define-record-type* <dmd-service> (define-record-type* <dmd-service>
dmd-service make-dmd-service dmd-service make-dmd-service
dmd-service? dmd-service?
@ -113,7 +134,11 @@ service that extends DMD-ROOT-SERVICE-TYPE and nothing else."
(stop dmd-service-stop ;g-expression (procedure) (stop dmd-service-stop ;g-expression (procedure)
(default #~(const #f))) (default #~(const #f)))
(auto-start? dmd-service-auto-start? ;Boolean (auto-start? dmd-service-auto-start? ;Boolean
(default #t))) (default #t))
(modules dmd-service-modules ;list of module names
(default %default-modules))
(imported-modules dmd-service-imported-modules ;list of module names
(default %default-imported-modules)))
(define (assert-valid-graph services) (define (assert-valid-graph services)
@ -158,41 +183,51 @@ which is undefined")
(for-each assert-satisfied-requirements services)) (for-each assert-satisfied-requirements services))
(define (dmd-service-file-name service)
"Return the file name where the initialization code for SERVICE is to be
stored."
(let ((provisions (string-join (map symbol->string
(dmd-service-provision service)))))
(string-append "dmd-"
(string-map (match-lambda
(#\/ #\-)
(chr chr))
provisions)
".scm")))
(define (dmd-service-file service)
"Return a file defining SERVICE."
(gexp->file (dmd-service-file-name service)
#~(begin
(use-modules #$@(dmd-service-modules service))
(make <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)))))
(define (dmd-configuration-file services) (define (dmd-configuration-file services)
"Return the dmd configuration file for SERVICES." "Return the dmd configuration file for SERVICES."
(define modules (define modules
;; Extra modules visible to dmd.conf. (delete-duplicates
'((guix build syscalls) (append-map dmd-service-imported-modules services)))
(gnu build file-systems)
(guix build utils)))
(assert-valid-graph services) (assert-valid-graph services)
(mlet %store-monad ((modules (imported-modules modules)) (mlet %store-monad ((modules (imported-modules modules))
(compiled (compiled-modules modules))) (compiled (compiled-modules modules))
(files (mapm %store-monad dmd-service-file services)))
(define config (define config
#~(begin #~(begin
(eval-when (expand load eval) (eval-when (expand load eval)
(set! %load-path (cons #$modules %load-path)) (set! %load-path (cons #$modules %load-path))
(set! %load-compiled-path (set! %load-compiled-path
(cons #$compiled %load-compiled-path))) (cons #$compiled %load-compiled-path)))
(use-modules (ice-9 ftw) (apply register-services (map primitive-load '#$files))
(guix build syscalls)
(guix build utils)
((gnu build file-systems)
#:select (check-file-system canonicalize-device-spec)))
(register-services
#$@(map (lambda (service)
#~(make <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. ;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around it.
(setenv "PATH" "/run/current-system/profile/bin") (setenv "PATH" "/run/current-system/profile/bin")