[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: services: Use 'source-module-closure' for (gnu build activation).
From: |
Ludovic Courtès |
Subject: |
01/03: services: Use 'source-module-closure' for (gnu build activation). |
Date: |
Tue, 20 Sep 2016 14:59:37 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 232ccbefc05aa7fbd3ea8b8f71a65bafc178a28a
Author: Ludovic Courtès <address@hidden>
Date: Tue Sep 20 17:38:59 2016 +0900
services: Use 'source-module-closure' for (gnu build activation).
* gnu/services.scm (activation-script)[%modules]: Remove.
Use 'source-module-closure' instead.
---
gnu/services.scm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/services.scm b/gnu/services.scm
index 7e322c5..693a7f8 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))