diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-11-25 10:59:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-11-25 11:59:54 +0100 |
| commit | 479b417b54ab5ef7ce0d46c409ab084d5eb3c9ad (patch) | |
| tree | 78a0f52203cf3ec127156643226270fb08779ded | |
| parent | fae685b9cc21860d84dc5a768795025376b7db06 (diff) | |
| download | gnu-guix-479b417b54ab5ef7ce0d46c409ab084d5eb3c9ad.tar gnu-guix-479b417b54ab5ef7ce0d46c409ab084d5eb3c9ad.tar.gz | |
services: dmd: Strip the default list of modules.
* gnu/services/dmd.scm (%default-imported-modules): Remove (gnu build
file-systems).
(%default-modules): Likewise, and remove (ice-9 ftw).
* gnu/services/base.scm (file-system-service-type): Add 'modules' and
'imported-modules' fields.
| -rw-r--r-- | gnu/services/base.scm | 9 | ||||
| -rw-r--r-- | gnu/services/dmd.scm | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 6077fb6272..c242c7dbb8 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -223,7 +223,14 @@ FILE-SYSTEM." (chdir "/") (umount #$target) - #f))))))) + #f)) + + ;; We need an additional module. + (modules `(((gnu build file-systems) + #:select (check-file-system canonicalize-device-spec)) + ,@%default-modules)) + (imported-modules `((gnu build file-systems) + ,@%default-imported-modules))))))) (define* (file-system-service file-system) "Return a service that mounts @var{file-system}, a @code{<file-system>} diff --git a/gnu/services/dmd.scm b/gnu/services/dmd.scm index 76f286a672..6f70f3d79b 100644 --- a/gnu/services/dmd.scm +++ b/gnu/services/dmd.scm @@ -107,18 +107,14 @@ service that extends DMD-ROOT-SERVICE-TYPE and nothing else." (define %default-imported-modules ;; Default set of modules imported for a service's consumption. '((guix build utils) - (guix build syscalls) - (gnu build file-systems))) + (guix build syscalls))) (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)))) + (guix build syscalls))) (define-record-type* <dmd-service> dmd-service make-dmd-service |