From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59298) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRH0n-0002qU-Ja for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRH0n-00019x-1f for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41327) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jRH0m-00019q-LG for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jRH0m-000185-GG for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:04 -0400 Subject: [bug#40770] [PATCH 5/5] services: system: Initial entries are non-monadic. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 22 Apr 2020 17:08:49 +0200 Message-Id: <20200422150849.5432-5-ludo@gnu.org> In-Reply-To: <20200422150849.5432-1-ludo@gnu.org> References: <20200422150849.5432-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40770@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= * 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 -;;; Copyright © 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2020 Efraim Flashner ;;; @@ -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