diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-20 17:38:59 +0900 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-20 22:42:11 +0900 |
| commit | 232ccbefc05aa7fbd3ea8b8f71a65bafc178a28a (patch) | |
| tree | 3724a2fc755fa7ab9f2bd0bc6c579edb4e04d3c3 /gnu/services.scm | |
| parent | 92330ba90d782b3b215b4521d93f5869a70e51e0 (diff) | |
services: Use 'source-module-closure' for (gnu build activation).
* gnu/services.scm (activation-script)[%modules]: Remove.
Use 'source-module-closure' instead.
Diffstat (limited to 'gnu/services.scm')
| -rw-r--r-- | gnu/services.scm | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index 7e322c50b0b..693a7f8001a 100644 --- a/gnu/services.scm +++ b/gnu/services.scm | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #:use-module (guix profiles) | 25 | #:use-module (guix profiles) |
| 26 | #:use-module (guix sets) | 26 | #:use-module (guix sets) |
| 27 | #:use-module (guix ui) | 27 | #:use-module (guix ui) |
| 28 | #:use-module (guix modules) | ||
| 28 | #:use-module (gnu packages base) | 29 | #:use-module (gnu packages base) |
| 29 | #:use-module (gnu packages bash) | 30 | #:use-module (gnu packages bash) |
| 30 | #:use-module (srfi srfi-1) | 31 | #:use-module (srfi srfi-1) |
| @@ -320,16 +321,6 @@ ACTIVATION-SCRIPT-TYPE." | |||
| 320 | 321 | ||
| 321 | (define (activation-script gexps) | 322 | (define (activation-script gexps) |
| 322 | "Return the system's activation script, which evaluates GEXPS." | 323 | "Return the system's activation script, which evaluates GEXPS." |
| 323 | (define %modules | ||
| 324 | '((gnu build activation) | ||
| 325 | (gnu build linux-boot) | ||
| 326 | (gnu build linux-modules) | ||
| 327 | (gnu build file-systems) | ||
| 328 | (guix build utils) | ||
| 329 | (guix build syscalls) | ||
| 330 | (guix build bournish) | ||
| 331 | (guix elf))) | ||
| 332 | |||
| 333 | (define (service-activations) | 324 | (define (service-activations) |
| 334 | ;; Return the activation scripts for SERVICES. | 325 | ;; Return the activation scripts for SERVICES. |
| 335 | (mapm %store-monad | 326 | (mapm %store-monad |
| @@ -338,7 +329,8 @@ ACTIVATION-SCRIPT-TYPE." | |||
| 338 | 329 | ||
| 339 | (mlet* %store-monad ((actions (service-activations))) | 330 | (mlet* %store-monad ((actions (service-activations))) |
| 340 | (gexp->file "activate" | 331 | (gexp->file "activate" |
| 341 | (with-imported-modules %modules | 332 | (with-imported-modules (source-module-closure |
| 333 | '((gnu build activation))) | ||
| 342 | #~(begin | 334 | #~(begin |
| 343 | (use-modules (gnu build activation)) | 335 | (use-modules (gnu build activation)) |
| 344 | 336 | ||
