diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-22 16:22:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-26 22:49:49 +0200 |
| commit | 0e5c2d5e145118ec47329d6b3a534344d2e89cd3 (patch) | |
| tree | bf84c01cbdd90a0ae3e044cb832f12d06ee67b15 /gnu/services.scm | |
| parent | 45c84c8f6f979c84d08b205ed3fb3d6769c4ae3f (diff) | |
| download | guix-0e5c2d5e145118ec47329d6b3a534344d2e89cd3.tar guix-0e5c2d5e145118ec47329d6b3a534344d2e89cd3.tar.gz | |
services: system: Initial entries are non-monadic.
* gnu/system.scm (operating-system-directory-base-entries): Return a
regular, non-monadic value.
* gnu/services.scm (system-derivation): Adjust accordingly.
* gnu/system/linux-container.scm (container-essential-services): Likewise.
Diffstat (limited to 'gnu/services.scm')
| -rw-r--r-- | gnu/services.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index ada6268a0b..2e4648bf78 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -318,11 +318,10 @@ This is a shorthand for (map (lambda (svc) ...) %base-services)." ;;; Core services. ;;; -(define (system-derivation mentries mextensions) +(define (system-derivation entries mextensions) "Return as a monadic value the derivation of the 'system' directory containing the given entries." - (mlet %store-monad ((entries mentries) - (extensions (mapm/accumulate-builds identity + (mlet %store-monad ((extensions (mapm/accumulate-builds identity mextensions))) (lower-object (file-union "system" |