From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59276) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRH0l-0002p7-T4 for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRH0l-00017H-HG for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41324) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jRH0l-000177-5I for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jRH0l-00017h-0h for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:03 -0400 Subject: [bug#40770] [PATCH 2/5] system: 'operating-system-directory-base-entries' uses 'profile'. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 22 Apr 2020 17:08:46 +0200 Message-Id: <20200422150849.5432-2-ludo@gnu.org> In-Reply-To: <20200422150849.5432-1-ludo@gnu.org> References: <20200422150849.5432-1-ludo@gnu.org> MIME-Version: 1.0 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): Use a declarative profile instead of 'profile-derivation'. --- gnu/system.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index fb48fedd7f..739b629367 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -475,17 +475,15 @@ OS." (define* (operating-system-directory-base-entries os) "Return the basic entries of the 'system' directory of OS for use as the value of the SYSTEM-SERVICE-TYPE service." - (let ((locale (operating-system-locale-directory os))) - (mlet* %store-monad ((kernel -> (operating-system-kernel os)) - (modules -> - (operating-system-kernel-loadable-modules os)) - (kernel - (profile-derivation - (packages->manifest - (cons kernel modules)) - #:hooks (list linux-module-database))) - (initrd -> (operating-system-initrd-file os)) - (params -> (operating-system-boot-parameters-file os))) + (let* ((locale (operating-system-locale-directory os)) + (modules (operating-system-kernel-loadable-modules os)) + (kernel (profile + (content (packages->manifest + (cons (operating-system-kernel os) modules))) + (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) -- 2.26.0