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 | |
| parent | 45c84c8f6f979c84d08b205ed3fb3d6769c4ae3f (diff) | |
| download | 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')
| -rw-r--r-- | gnu/services.scm | 5 | ||||
| -rw-r--r-- | gnu/system.scm | 9 | ||||
| -rw-r--r-- | gnu/system/linux-container.scm | 6 |
3 files changed, 8 insertions, 12 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" diff --git a/gnu/system.scm b/gnu/system.scm index 3a86564fa2..3c511f4089 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -506,11 +506,10 @@ value of the SYSTEM-SERVICE-TYPE service." (hooks (list linux-module-database)))) (initrd (operating-system-initrd-file os)) (params (operating-system-boot-parameters-file os))) - (with-monad %store-monad - (return `(("kernel" ,kernel) - ("parameters" ,params) - ("initrd" ,initrd) - ("locale" ,locale)))))) ;used by libc + `(("kernel" ,kernel) + ("parameters" ,params) + ("initrd" ,initrd) + ("locale" ,locale)))) ;used by libc (define (operating-system-default-essential-services os) "Return the list of essential services for OS. These are special services diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index c8807398b3..c5e2e4bf9c 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; @@ -53,9 +53,7 @@ from OS that are needed on the bare metal and not in a container." (operating-system-default-essential-services os))) (cons (service system-service-type - (let ((locale (operating-system-locale-directory os))) - (with-monad %store-monad - (return `(("locale" ,locale)))))) + `(("locale" ,(operating-system-locale-directory os)))) ;; If network is to be shared with the host, remove network ;; configuration files from etc-service. (if shared-network? |