[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: services: system: Initial entries are non-monadic.
From: |
guix-commits |
Subject: |
05/06: services: system: Initial entries are non-monadic. |
Date: |
Sun, 26 Apr 2020 16:49:59 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 0e5c2d5e145118ec47329d6b3a534344d2e89cd3
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed Apr 22 16:22:33 2020 +0200
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.
---
gnu/services.scm | 5 ++---
gnu/system.scm | 9 ++++-----
gnu/system/linux-container.scm | 6 ++----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/gnu/services.scm b/gnu/services.scm
index ada6268..2e4648b 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 3a86564..3c511f4 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 c880739..c5e2e4b 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 <address@hidden>
-;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <address@hidden>
;;; Copyright © 2019 Arun Isaac <address@hidden>
;;; Copyright © 2020 Efraim Flashner <address@hidden>
;;;
@@ -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?
- branch master updated (1408e2a -> ccbc427), guix-commits, 2020/04/26
- 01/06: profiles: Add lowerable <profile> record type., guix-commits, 2020/04/26
- 03/06: services: profile: Use a declarative profile., guix-commits, 2020/04/26
- 04/06: pack: Use a declarative profile., guix-commits, 2020/04/26
- 02/06: system: 'operating-system-directory-base-entries' uses 'profile'., guix-commits, 2020/04/26
- 06/06: channels: Use a declarative profile., guix-commits, 2020/04/26
- 05/06: services: system: Initial entries are non-monadic.,
guix-commits <=