From: "Ludovic Courtès" <ludo@gnu.org>
To: 40770@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#40770] [PATCH 5/5] services: system: Initial entries are non-monadic.
Date: Wed, 22 Apr 2020 17:08:49 +0200 [thread overview]
Message-ID: <20200422150849.5432-5-ludo@gnu.org> (raw)
In-Reply-To: <20200422150849.5432-1-ludo@gnu.org>
* 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 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 739b629367..1872a2ed61 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -483,11 +483,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?
--
2.26.0
next prev parent reply other threads:[~2020-04-22 15:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 15:06 [bug#40770] [PATCH 0/5] Add declarative profiles Ludovic Courtès
2020-04-22 15:08 ` [bug#40770] [PATCH 1/5] profiles: Add lowerable <profile> record type Ludovic Courtès
2020-04-22 15:08 ` [bug#40770] [PATCH 2/5] system: 'operating-system-directory-base-entries' uses 'profile' Ludovic Courtès
2020-04-22 15:08 ` [bug#40770] [PATCH 3/5] services: profile: Use a declarative profile Ludovic Courtès
2020-04-22 15:08 ` [bug#40770] [PATCH 4/5] pack: " Ludovic Courtès
2020-04-22 15:08 ` Ludovic Courtès [this message]
2020-04-22 17:12 ` [bug#40770] [PATCH 0/5] Add declarative profiles Mathieu Othacehe
2020-04-22 19:46 ` Ludovic Courtès
2020-04-26 20:51 ` bug#40770: " Ludovic Courtès
2020-04-22 19:46 ` [bug#40770] " Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422150849.5432-5-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=40770@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).