From patchwork Sat Jan 18 11:41:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tusharhero--- via Guix-patches via X-Patchwork-Id: 37142 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 3E44327BBEA; Sat, 18 Jan 2025 11:39:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 63BD627BBE2 for ; Sat, 18 Jan 2025 11:39:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ7AS-0004qj-I3; Sat, 18 Jan 2025 06:39:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tZ7AQ-0004q5-OW for guix-patches@gnu.org; Sat, 18 Jan 2025 06:39:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tZ7AQ-0003et-7Q; Sat, 18 Jan 2025 06:39:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Nmxr3kQYoRMBz7OFN/OYICHiVQ4N86iJ79BwTeO2oSA=; b=oI8h0D2lkblSRiWPvq7X7/lzDsGYt1/28mMDjZV3dNQYRI53Auu1PxXBGp1Zbxfqg/U0EIgKeOsBd2ilJpfmQKBjSobC7FulBFTITXsej+20Dkj9uWkGEVnueP+CK2i7U8zVy2i9Ew0ykTTt4d518tgPxZuSf9CJGGCCZFuyQRJVm1B0oQoEnJYpWEtF33TLE1+IFrD8cjOx6+o1MYa89CM60/2neHDnuKYKSYHTWALR4eGiuRy8R3KXImnFuJrwymWRO3JBPOwyFUQkG9Iypn04ProwI4YHn0dH94nP2Hy+vypgmk8ZyAjazh3YZ3QVSUM6/YEyhvcdYiYPTiZP9g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ7AM-0005ac-EG; Sat, 18 Jan 2025 06:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75647] [PATCH 1/2] profiles: Add #:build? argument to lower-manifest-entry. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 18 Jan 2025 11:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75647@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 75647-submit@debbugs.gnu.org id=B75647.173720032821451 (code B ref 75647); Sat, 18 Jan 2025 11:39:02 +0000 Received: (at 75647) by debbugs.gnu.org; 18 Jan 2025 11:38:48 +0000 Received: from localhost ([127.0.0.1]:40521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ7A8-0005Zv-9J for submit@debbugs.gnu.org; Sat, 18 Jan 2025 06:38:48 -0500 Received: from mail.envs.net ([5.199.136.28]:60502) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tZ7A6-0005Zj-8a for 75647@debbugs.gnu.org; Sat, 18 Jan 2025 06:38:47 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id CB01338A3D9A; Sat, 18 Jan 2025 11:38:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id B8_m3AybZsNf; Sat, 18 Jan 2025 11:38:41 +0000 (UTC) Received: from localhost (unknown [112.44.106.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 18 Jan 2025 11:38:41 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6a70098b; Sat, 18 Jan 2025 11:42:10 +0000 (UTC) Date: Sat, 18 Jan 2025 19:41:58 +0800 Message-ID: <11916b9f37612909f6ba4e07ca06ab903b7679ac.1737200329.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: tusharhero--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * guix/profiles.scm (lower-manifest-entry): Add #:build? keyword argument. Change-Id: Iab2832d1bac1b28f6124e0c4e78e9284daf9a2ea --- guix/profiles.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index a28cf872cf..a05b90d685 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -308,9 +308,10 @@ (define (manifest-entry-lookup manifest) ((_ . entry) entry) (#f #f)))) -(define* (lower-manifest-entry entry system #:key target) +(define* (lower-manifest-entry entry system #:key target + (build? #f)) "Lower ENTRY for SYSTEM and TARGET such that its 'item' field is a store -file name." +file name. When BUILD? is true, build the entry before returning." (define (recurse entry) (mapm/accumulate-builds (lambda (entry) (lower-manifest-entry entry system @@ -319,12 +320,19 @@ (define* (lower-manifest-entry entry system #:key target) (let ((item (manifest-entry-item entry))) (if (string? item) - (with-monad %store-monad + (mbegin %store-monad + (if (build?) + (build (list item)) + (return #f)) (return entry)) - (mlet %store-monad ((drv (lower-object item system + (mlet* %store-monad ((drv (lower-object item system #:target target)) + (dependencies (recurse entry)) - (output -> (manifest-entry-output entry))) + (output -> (manifest-entry-output entry)) + (built (if build? + (built-derivations (list (cons drv output))) + (return #f)))) (return (manifest-entry (inherit entry) (item (derivation->output-path drv output))