From patchwork Wed Apr 22 15:08:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 21414 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 66D3B27BBE4; Wed, 22 Apr 2020 16:10:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 400D827BBE1 for ; Wed, 22 Apr 2020 16:10:18 +0100 (BST) Received: from localhost ([::1]:52368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRH0z-00030C-Qr for patchwork@mira.cbaines.net; Wed, 22 Apr 2020 11:10:17 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#40770] [PATCH 2/5] system: 'operating-system-directory-base-entries' uses 'profile'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Apr 2020 15:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40770@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 40770-submit@debbugs.gnu.org id=B40770.15875681454185 (code B ref 40770); Wed, 22 Apr 2020 15:10:02 +0000 Received: (at 40770) by debbugs.gnu.org; 22 Apr 2020 15:09:05 +0000 Received: from localhost ([127.0.0.1]:52857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRGzo-00015Q-Qo for submit@debbugs.gnu.org; Wed, 22 Apr 2020 11:09:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRGzm-00014V-Hc for 40770@debbugs.gnu.org; Wed, 22 Apr 2020 11:09:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59986) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRGzh-0006wW-Bw; Wed, 22 Apr 2020 11:08:57 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=52530 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jRGzf-00029i-TD; Wed, 22 Apr 2020 11:08:56 -0400 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> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200422150849.5432-1-ludo@gnu.org> References: <20200422150849.5432-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)