summaryrefslogtreecommitdiff
path: root/gnu/tests/base.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-20 11:01:07 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-20 23:47:08 +0200
commit378daa8cb677121e1893f9173af1db060720d6e4 (patch)
tree5263997c3a917de0e736b95435a8d5520dded9e4 /gnu/tests/base.scm
parent636bb2b5e350bb5eb1d934da690c85e52e352bc4 (diff)
downloadpatches-378daa8cb677121e1893f9173af1db060720d6e4.tar
patches-378daa8cb677121e1893f9173af1db060720d6e4.tar.gz
services: boot: Take gexps instead of monadic gexps.
* gnu/services.scm (compute-boot-script): Rename 'mexps' to 'gexps' and remove 'mlet' form. (boot-service-type): Update comment. (cleanup-gexp): Remove 'with-monad' and 'return'. (activation-script): Rewrite in non-monadic style: use 'scheme-file' instead of 'gexp->file'. (gexps->activation-gexp): Remove 'mlet', return a gexp. * gnu/services/shepherd.scm (shepherd-boot-gexp): Remove 'with-monad' and 'return'. * gnu/system.scm (operating-system-boot-script): Remove outdated comment. * gnu/tests/base.scm (%cleanup-os): For 'dirty-service', remove 'with-monad' and 'return'.
Diffstat (limited to 'gnu/tests/base.scm')
-rw-r--r--gnu/tests/base.scm27
1 files changed, 13 insertions, 14 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index d209066a74..4c24cf57f6 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -484,20 +484,19 @@ in a loop. See <http://bugs.gnu.org/26931>.")
(simple-operating-system
(simple-service 'dirty-things
boot-service-type
- (with-monad %store-monad
- (let ((script (plain-file
- "create-utf8-file.sh"
- (string-append
- "echo $0: dirtying /tmp...\n"
- "set -e; set -x\n"
- "touch /witness\n"
- "exec touch /tmp/λαμβδα"))))
- (with-imported-modules '((guix build utils))
- (return #~(begin
- (setenv "PATH"
- #$(file-append coreutils "/bin"))
- (invoke #$(file-append bash "/bin/sh")
- #$script)))))))))
+ (let ((script (plain-file
+ "create-utf8-file.sh"
+ (string-append
+ "echo $0: dirtying /tmp...\n"
+ "set -e; set -x\n"
+ "touch /witness\n"
+ "exec touch /tmp/λαμβδα"))))
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (setenv "PATH"
+ #$(file-append coreutils "/bin"))
+ (invoke #$(file-append bash "/bin/sh")
+ #$script)))))))
(define (run-cleanup-test name)
(define os