From patchwork Tue Aug 12 09:04:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43363 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 7D2E827BC4B; Tue, 12 Aug 2025 10:07:11 +0100 (BST) 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 EF50A27BC49 for ; Tue, 12 Aug 2025 10:07:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxU-0006pD-1L; Tue, 12 Aug 2025 05:06:16 -0400 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 1ulkxP-0006mE-0T for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:11 -0400 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 1ulkxI-0001Gg-Kn for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:10 -0400 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=+YfBb45MrOKY2EIo6Lksm21qYEusbEHOXzOUDQx7KRg=; b=lWx4PtDwesPTROZ7DGtV4A8xL75WjHvBZq+F7lzhNItPtVrl+pq28Bq4zj3UKLHxczE/wKi9/tet9atjKlWc6lvzcx8R2Ji/2TH+WXkrifhMGvhZiKHbMaOWp3R7tSV7I+yIOHa5Wi/X4391K6aru26e3W8JVqnLwo1qGxZ40So4kIdj+8XdWLrvDXtfu/6+h8SG78OgJDy+7RMFF6lAZZ0Dn2Eyd12snXtRPebQSxaGQEJEGFynXe25PvhN4vn0mztC+Ba3ZkUZM7aZ6pfTgr/K7dMtMIdVeYhtfOujANd1ET5TtzI2TiebXCzS5cpVXMMz/EY+2VN27mS9V1SHlA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxH-0007f6-CB for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 02/43] build-system: gnu: Redefine gnu-build and gnu-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79224@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498951128666 (code B ref 79224); Tue, 12 Aug 2025 09:06:03 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:11 +0000 Received: from localhost ([127.0.0.1]:51735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwQ-0007SH-RH for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:11 -0400 Received: from 3.mo563.mail-out.ovh.net ([46.105.40.8]:57423) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwM-0007Rj-6I for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:07 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZ81cYjz5yC3; Tue, 12 Aug 2025 09:05:04 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:03 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.254.229]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZ72DLMz5wGk; Tue, 12 Aug 2025 09:05:03 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id A51BF9A3280; Tue, 12 Aug 2025 09:05:02 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003b626e8b4-ecb9-41b0-adce-a7f4c200950f, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:10 +0200 Message-ID: <20250812090457.19016-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812090457.19016-1-ngraves@ngraves.fr> References: <20250812090457.19016-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 269934506724352738 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddugeeirdduieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=+YfBb45MrOKY2EIo6Lksm21qYEusbEHOXzOUDQx7KRg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989504; v=1; b=BQStjKsq1gAeZJuXlnPEdONfOigEhr/HlTJiAcjvbHpvJKhrXV3RJSdn1214Uiu1t4D+JTEZ Q5BIFjOmSBlQSUrc1wdKyNgQb2mQYq/x6E9ZG9WsIh+thf4Cl0XVSXiUK/PBpxjSLRB+i5qux4b Y856foIy9fSwLkYLwYoTLKUxY/Vf2+BE7yqzDBlDQp0XFg+4HJZTezVtoFFTXNtZc52NszTmAgQ QDBuQzvCteDRj5u08rkqRhyR/XsIFAX2QYHCVKqZVyIXDZlnOc/MH8xvJcjGXUyfUg+Hbdl2zaS PFpdu4V5eYlBM31zZy9GV2C4YQn0PzDXBpEAFPY+oQ1xQ== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * guix/build-system/gnu.scm (gnu-build): Monadic procedure returns a gexp instead of a derivation. (gnu-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I6bf922ecd1474df104f959989db315d7ddc278b6 --- guix/build-system/gnu.scm | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 8f0883956e3..865301a92cf 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -429,18 +429,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - ;; Note: Always pass #:graft? #f. Without it, ALLOWED-REFERENCES & - ;; co. would be interpreted as referring to grafted packages. - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) ;;; @@ -574,16 +564,8 @@ (define %outputs #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define gnu-build-system (build-system