summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-09-20 17:38:59 +0900
committerLudovic Courtès <ludo@gnu.org>2016-09-20 22:42:11 +0900
commit232ccbefc05aa7fbd3ea8b8f71a65bafc178a28a (patch)
tree3724a2fc755fa7ab9f2bd0bc6c579edb4e04d3c3
parent92330ba90d782b3b215b4521d93f5869a70e51e0 (diff)
downloadguix-232ccbefc05aa7fbd3ea8b8f71a65bafc178a28a.tar.gz
services: Use 'source-module-closure' for (gnu build activation).
* gnu/services.scm (activation-script)[%modules]: Remove.
Use 'source-module-closure' instead.
-rw-r--r--gnu/services.scm14
1 files changed, 3 insertions, 11 deletions
diff --git a/gnu/services.scm b/gnu/services.scm
index 7e322c50b0..693a7f8001 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -25,6 +25,7 @@
   #:use-module (guix profiles)
   #:use-module (guix sets)
   #:use-module (guix ui)
+  #:use-module (guix modules)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (srfi srfi-1)
@@ -320,16 +321,6 @@ ACTIVATION-SCRIPT-TYPE."
 
 (define (activation-script gexps)
   "Return the system's activation script, which evaluates GEXPS."
-  (define %modules
-    '((gnu build activation)
-      (gnu build linux-boot)
-      (gnu build linux-modules)
-      (gnu build file-systems)
-      (guix build utils)
-      (guix build syscalls)
-      (guix build bournish)
-      (guix elf)))
-
   (define (service-activations)
     ;; Return the activation scripts for SERVICES.
     (mapm %store-monad
@@ -338,7 +329,8 @@ ACTIVATION-SCRIPT-TYPE."
 
   (mlet* %store-monad ((actions (service-activations)))
     (gexp->file "activate"
-                (with-imported-modules %modules
+                (with-imported-modules (source-module-closure
+                                        '((gnu build activation)))
                   #~(begin
                       (use-modules (gnu build activation))