From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59282) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRH0m-0002pE-BB 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 1jRH0m-00018W-1k for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jRH0l-00018A-M9 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-00017o-F3 for guix-patches@gnu.org; Wed, 22 Apr 2020 11:10:03 -0400 Subject: [bug#40770] [PATCH 3/5] services: profile: Use a declarative profile. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 22 Apr 2020 17:08:47 +0200 Message-Id: <20200422150849.5432-3-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/services.scm (packages->profile-entry): Use 'profile' instead of 'profile-derivation'. --- gnu/services.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 126e0814eb..ada6268a0b 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -691,10 +691,10 @@ executables, making them setuid-root."))) (define (packages->profile-entry packages) "Return a system entry for the profile containing PACKAGES." - (mlet %store-monad ((profile (profile-derivation - (packages->manifest - (delete-duplicates packages eq?))))) - (return `(("profile" ,profile))))) + (with-monad %store-monad + (return `(("profile" ,(profile + (content (packages->manifest + (delete-duplicates packages eq?))))))))) (define profile-service-type ;; The service that populates the system's profile---i.e., -- 2.26.0