From patchwork Tue Aug 12 09:04:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43353 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 1E01F27BC4B; Tue, 12 Aug 2025 10:06:37 +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=unavailable 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 4952227BC49 for ; Tue, 12 Aug 2025 10:06:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxX-0006sc-K1; Tue, 12 Aug 2025 05:06:20 -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 1ulkxO-0006m9-V8 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-0001Gm-JX 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:Date:From:To:In-Reply-To:References:Subject; bh=JBIhLKsf7yqX0Z6rylZvuZrPdoDe+nWN5n32aXdm10A=; b=Bf8QvCJigk01Eu34kBFT9xB/FRx52fguFFi9483RYuecUeOS3y9gPt2D8dSlCiclvDN3S5CBlqzNInSdBs97oLQU2SRFEDSDGRa7x/HEibRTkCJZEsVcRA5tysCQY9YpO9BdROl5MbyGKMbl7up8bWvCgNGDaQ59JO4K6pI3+7U6xCORSvJ6Ycnx5lFc34cPuMeHD/y4DZR3+9B+aXqvwZyF5I5wBP+mc9eTkO3JaTAkQjbwKKig9o2p/my2a92zdt5xt9tW8E3kF/7J2FOlIczP4LKjdPUcCjdeQZe7DZwZD5Q5VTmSjDxUhxP9Fc4mktDkF/ld3Cl7cp1ZJUpHCQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxI-0007fU-20 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 01/43] guix: packages: Extend bag-build to support gexp. References: <20250812085741.16912-1-ngraves@ngraves.fr> In-Reply-To: <20250812085741.16912-1-ngraves@ngraves.fr> 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.175498951528837 (code B ref 79224); Tue, 12 Aug 2025 09:06:03 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:15 +0000 Received: from localhost ([127.0.0.1]:51742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwU-0007Uy-F7 for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:15 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:44749) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwI-0007RJ-Ug for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:07 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZ460ctz1yVX; Tue, 12 Aug 2025 09:05:00 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:00 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.158]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZ44sMBz1xrP; Tue, 12 Aug 2025 09:05:00 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 1AC6A3E3261; Tue, 12 Aug 2025 09:04:59 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S0011b571201-87dd-4732-9e1b-976639729e1a, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:09 +0200 Message-ID: <20250812090457.19016-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Ovh-Tracer-Id: 269090079801074402 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetveehffevvdfgtddthedvhfeguefggeffteetueeliedvhffhjeegudehleegheenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=JBIhLKsf7yqX0Z6rylZvuZrPdoDe+nWN5n32aXdm10A=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989500; v=1; b=lwvM/c6cnVYXynAb0L6UvIVa8Hg35wrm6cPzem2lUv/uPnYiSE1ujSuNq78Cwp15HQjm949g TFLJ8lKKvJw6HZSz9hDIlWTqVCZ7rwu21GMHL7W3osPc9IR5gwWwMPvLGO/sovQtQ5e5kV2J7T0 Te3V4Ry8Kzcjsixfum2jJCgT4kAEAPx9M7A/WwzdoWUvCFlTU8iRZ7COYZWWcba3y4SmetUZK29 o2/dlREMRBdlnRtUIW+tGnDH83C3fsg8ZkRRwW9IqvGvT85pdrvt/B4JBw6k4JleK4Fy92UJfxG 4tmmcrwVdlSANNAS34DXnj2ekWMG/Hzc8br9jto3gos+g== 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 Rationale: The goal of this proposition was to enable guix users to edit build-system lower builders on-the-fly, which is currently not possible. This is done by keeping a higher-level representation of the builder - a gexp rather than a derivation - as the bag-build field. * guix/build-system.scm (): Update comment. * guix/packages.scm (bag->derivation): Handle gexp bag-build. Rename current procedure to... (bag-builder):... this procedure. (bag->cross-derivation): Rename procedure to... (bag-cross-builder):... this procedure. Change-Id: I56c5a9dab9954307f95b29eab5e02ee058271684 --- guix/build-system.scm | 2 +- guix/packages.scm | 53 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/guix/build-system.scm b/guix/build-system.scm index 76d670995ce..a4dcdc52d85 100644 --- a/guix/build-system.scm +++ b/guix/build-system.scm @@ -79,7 +79,7 @@ (define-record-type* bag %make-bag (default '("out"))) (arguments bag-arguments ;list (default '())) - (build bag-build)) ;bag -> derivation + (build bag-build)) ;bag -> gexp or derivation (define* (make-bag build-system name #:key source (inputs '()) (native-inputs '()) diff --git a/guix/packages.scm b/guix/packages.scm index 1d5986c5f42..1df9cb67f02 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2023 Simon Tournier ;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 David Elsing +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ (define-module (guix packages) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module (ice-9 regex) + #:use-module (ice-9 optargs) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-26) @@ -1967,12 +1969,12 @@ (define (input=? input1 input2) (derivation=? obj1 obj2)) (equal? obj1 obj2)))))))) -(define* (bag->derivation bag #:optional context) - "Return the derivation to build BAG for SYSTEM. Optionally, CONTEXT can be -a package object describing the context in which the call occurs, for improved -error reporting." +(define* (bag-builder bag #:optional context) + "Return the gexp or derivation to build BAG for SYSTEM. Optionally, CONTEXT +can be a package object describing the context in which the call occurs, for +improved error reporting." (if (bag-target bag) - (bag->cross-derivation bag) + (bag-cross-builder bag) (mlet* %store-monad ((system -> (bag-system bag)) (inputs -> (bag-transitive-inputs bag)) (input-drvs (mapm %store-monad @@ -1994,10 +1996,10 @@ (define* (bag->derivation bag #:optional context) #:outputs (bag-outputs bag) #:system system (bag-arguments bag))))) -(define* (bag->cross-derivation bag #:optional context) - "Return the derivation to build BAG, which is actually a cross build. -Optionally, CONTEXT can be a package object denoting the context of the call. -This is an internal procedure." +(define* (bag-cross-builder bag #:optional context) + "Return the gexp or derivation to build BAG, which is actually a cross +build. Optionally, CONTEXT can be a package object denoting the context of the +call. This is an internal procedure." (mlet* %store-monad ((system -> (bag-system bag)) (target -> (bag-target bag)) (host -> (bag-transitive-host-inputs bag)) @@ -2038,6 +2040,39 @@ (define* (bag->cross-derivation bag #:optional context) #:system system #:target target (bag-arguments bag)))) +(define* (bag->derivation bag #:optional context) + "Return the derivation to build BAG for SYSTEM. Optionally, CONTEXT can be +a package object describing the context in which the call occurs, for improved +error reporting." + (mlet %store-monad ((builder (bag-builder bag context))) + (match builder + ((? derivation? drv) + (return drv)) + ((? gexp? gexp) + (let-keywords (bag-arguments bag) #t + ((allowed-references #f) + (disallowed-references #f) + (guile #f) + (substitutable? #t)) + (mlet %store-monad + ((guile (package->derivation (or guile (default-guile)) + (bag-system bag) + #:graft? #f))) + ;; Note: Always pass #:graft? #f. Without it, ALLOWED-REFERENCES & + ;; co. would be interpreted as referring to grafted packages. + (gexp->derivation (bag-name bag) gexp + #:system (bag-system bag) + #:target (and (bag-target bag)) + #:graft? #f + #:substitutable? substitutable? + #:allowed-references allowed-references + #:disallowed-references disallowed-references + #:guile-for-build guile)))) + ;; build-bag has to be drv or gexp, else raise. + (_ + (raise (condition (&package-error + (package context)))))))) + (define bag->derivation* (store-lower bag->derivation)) 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 From patchwork Tue Aug 12 09:04:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43365 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 4391027BC4B; Tue, 12 Aug 2025 10:07:16 +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 0BFA027BC49 for ; Tue, 12 Aug 2025 10:07:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxR-0006oP-Py; Tue, 12 Aug 2025 05:06:13 -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 1ulkxO-0006mC-WB 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-0001Gp-OP 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=Sq8pDQOZBH6iXmhfOVo2QuePppn80MwJ2r22OjGSQHA=; b=adHYN5BDhsETj8F7liJSw/ik72ZDlMl/Zsnfn1IR6GkQTYCxKlP4F7ayK6xwX/0Ki0IYMit3d6Nvb1StHcF5nhYyWhB6Vsd5JeCrE4xf2fE3xgg2rPRdqU2XGdzwLTUIHnm2nKiZMZyATbdmoLaz7ocXifwPrDNhLTY0MRZOW9k4WDvFVUmZ4pAcD5htOzuVWkODGqGnscL+ENnOikqf9xCz4uJCz277v15JyWJpvlhmu78LomKO/jfAXSyXIM+4exKSpnmdNaun36RS0QpKjgwjmUefgEI7zHMJrL5r7qtcw9QePD3p2MXvL1p5MziM5lBU1YV/jx3F/jiKtHw+Xw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxI-0007fh-Hb for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 03/43] build-system: agda: Redefine agda-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:04 +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.175498951528856 (code B ref 79224); Tue, 12 Aug 2025 09:06:04 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:15 +0000 Received: from localhost ([127.0.0.1]:51747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwV-0007V9-7j for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:15 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:41255) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwN-0007Rn-AA for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:08 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZ92CHRz20qv; Tue, 12 Aug 2025 09:05:05 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:05 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.229]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZ91492z5xPq; Tue, 12 Aug 2025 09:05:05 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 2271B8E327B; Tue, 12 Aug 2025 09:05:04 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G005795a5264-9764-47b3-9344-392e851c01a0, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:11 +0200 Message-ID: <20250812090457.19016-3-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: 270497456542311138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 35 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdlfeehmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Sq8pDQOZBH6iXmhfOVo2QuePppn80MwJ2r22OjGSQHA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989505; v=1; b=UAcf31+NSHpMwg/szu+MZW8cbQlBu3XqeOzLIkKEcoEjnPEI1WLbBeNgYkOnxufprTjhg8MG 5AuulyTa/LgLC9q9h0ssr0ueNgKQpk7EfIjm27fWDtk/bYlvl9r1/638XQe4hfQx0IyDG0l4xkm Mi/2yzxkLWTWK2ODvE9pMxO9K8hqtMLhbNapxh5wRnHGRbh2heFptCo90+MDWxK7LIy3mIthPv1 WFqiigMDA498XelWossbYV5T/4IQ94IzJw0Pu258iwg2N1Kbxhjo2lNTcdBcAAoBfKVxzqZQTto 3+VoI3w/ZZrI4IbUyTuAUctjEvmuAYYwqodJOaOl+GGhA== 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/agda.scm (agda-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I3c21a043a0687f4776d44297ed3dd4697a606b40 --- guix/build-system/agda.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/agda.scm b/guix/build-system/agda.scm index ec6ad860e08..b33737ffa28 100644 --- a/guix/build-system/agda.scm +++ b/guix/build-system/agda.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Josselin Poiret +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,11 +109,8 @@ (define builder #:plan '#$plan #:extra-files '#$extra-files)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define agda-build-system (build-system From patchwork Tue Aug 12 09:04:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43369 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 5B00227BC4B; Tue, 12 Aug 2025 10:07:23 +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 343BF27BC49 for ; Tue, 12 Aug 2025 10:07:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxj-0006xV-AM; Tue, 12 Aug 2025 05:06:31 -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 1ulkxQ-0006nO-2m for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -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 1ulkxK-0001Gz-9X 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=I6km0w8v6EW8YdFDN4Ve+FZBkP6q70fXXbms1TDBcB0=; b=W+kiRDKNSgpcu2LCyY/Z2M6faQnG7j7ZKS7XVVFjJ5ASbJY6CcVaImm5sdfuH5J5DtnLFnnHJrRG0uZmXGrTPmNyucZuon0yOgskBxL4jU11mRBqomlRDkSA0sn5HnuFy1atN2F/E5p1vqGz6lWJrIJFKnm1SIv4x6R/QZx9btVrJFHh+Eorx6cZq5LjeQhsrRmekGLnQxSD08DXMZs+54ZmBvGW7ACjFaTWJTfPurBres/YMvPOoFKz7qW/+WYG9lEM+Gy3kyjIiItPs05O9Wx0KC/kPlog0RCUwFZn68vwy7dt7Ta3TIH64RL6z6n+b2IpNLsj1gwam+cLR5hN/A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxJ-0007g0-3o for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 04/43] build-system: android-ndk: Redefine gnu-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:05 +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.175498951628882 (code B ref 79224); Tue, 12 Aug 2025 09:06:05 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:16 +0000 Received: from localhost ([127.0.0.1]:51749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwV-0007VW-O7 for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:16 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:34991) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwO-0007S0-EI for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:09 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZC2Z3hz211G; Tue, 12 Aug 2025 09:05:07 +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:07 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.53]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZB6TCXz5xQq; Tue, 12 Aug 2025 09:05:06 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 3EA41B8326A; Tue, 12 Aug 2025 09:05:05 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-113S0078ba0f904-924c-4a06-b1f8-86f56df32902, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:12 +0200 Message-ID: <20250812090457.19016-4-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: 271060404598072034 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=I6km0w8v6EW8YdFDN4Ve+FZBkP6q70fXXbms1TDBcB0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989507; v=1; b=1twOLpp/XxidtpX9ON1XgLI1HL1DgKvTvMBGnQs8eIUglQY+fL+IcLQY9V/yyDMizPZ3dwUf d2LzLFGHAZwpo+F+C/K4Tpvw2jkcMXNUS55vLhyIh/hVrSVwIlheRmJve/uPLrt+Jlh/yd5hAxc q0fae4KihuUYS/sRlWFh9YhBUs2KhA+ZQqOU/3mYCt2Qetlk/Txclrczh9ka8uL3tLY+bVcnkP8 HSLKlqeVFWld/tnr1OBAxzrqkWUcd54JMzDvT4ZGJ6ft5cW7rNak4HXenRTX8Bt8wpsYE5WBdTI /uHQLqV80sL5VTz0wx0E1kb4FepRCLwePSiM/N5KqO7HA== 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/android-ndk.scm (android-ndk-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: If1737d77ebccd418ad461c91aff170273855ed45 --- guix/build-system/android-ndk.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index 565ec1d3632..b226866c102 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,11 +84,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (lower name #:key source inputs native-inputs outputs system target From patchwork Tue Aug 12 09:04:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43359 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 F3E2827BC49; Tue, 12 Aug 2025 10:06:59 +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=unavailable 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 AC6A927BC4A for ; Tue, 12 Aug 2025 10:06:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxU-0006oX-00; 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 1ulkxO-0006mB-Vk 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 1ulkxJ-0001Gw-S6 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=5A8UaCRGskr7vgphJNb6Qm3DCGyr4Wt2/5QPotkBjJE=; b=em2PxQ8X3omQ5GJrjhraY4R9VSZaoBykhCb92eapr5lIsO2i00u16e1YFJ55ySfAi6+arNdY8l4vNNXi0qHDSzaMVewhcOmtwOrGh4GNCOrVgZ85aRZ6BApV+PE38M0mCxXZ0W49Z8zCFi/nsMt1v4VA01kBg85nfqBZsEPvJl5WO4ZpfH8FKH+QF9CxwGraXBey5URs/blpbYei9dGePRzKEqicNbST1dC//EWSo9WXJMqx72y1l96alg4nXsZT5qrRXCkYHyLeNlP2K37+6dBZwp1VdTJ4qaSKQ5OTRrLgg79CwBcYyRxOln9zJ+52iVhXOvggtXSD61r7QKqaZw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxJ-0007gH-LN for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 05/43] build-system: ant: Redefine ant-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:05 +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.175498951728945 (code B ref 79224); Tue, 12 Aug 2025 09:06:05 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:17 +0000 Received: from localhost ([127.0.0.1]:51751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwW-0007WY-CM for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:16 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:46499) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwR-0007SC-1Q for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:12 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZF1Jjfz2121; Tue, 12 Aug 2025 09:05:09 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:09 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.53]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZD6GpLz5xPs; Tue, 12 Aug 2025 09:05:08 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 5D91F94325D; Tue, 12 Aug 2025 09:05:08 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S008a0a7f116-75fa-48e7-b856-b05d226e4e33, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:13 +0200 Message-ID: <20250812090457.19016-5-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: 271341877631181538 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=5A8UaCRGskr7vgphJNb6Qm3DCGyr4Wt2/5QPotkBjJE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989509; v=1; b=KtSWvzEcfHKKzolFJ4zPSrtfvchMc8LIkdtgKjDPgdjGyXJZM42fFXs6iDx1pH8rbj4Zk75f X0XPY/cof2a8/4cnIe46s7Fi0r42zNtdyF9nQC46DCIOdG4Fkx2zjCvcJpITaJV8fAZK8pypW2R Nz9584MNM+NETsjozSWru/tsFFYuJ8RH0uttAudKkCv9WsaY19F2IIab7cVZOMt+U40Ab4seC4O Zm9cX4+b7jgRvcR5U2r96d6gT3ACj4abZzvppJ2yGVu1UbzzIGTHWg2txd0fD1ftfkLj6bM1czn 0suNwd8lmWqpQNdpI2tu44hVmbXTDfWafUUpprxecLswg== 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/ant.scm (ant-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I4f1152e29b938dbf37125bf156fb56b841011f06 --- guix/build-system/ant.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 9816cc061c9..3ce919032fc 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -144,11 +145,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define ant-build-system (build-system From patchwork Tue Aug 12 09:04:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43357 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 E173227BC4A; Tue, 12 Aug 2025 10:06:53 +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=unavailable 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 C0E9127BC49 for ; Tue, 12 Aug 2025 10:06:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxS-0006oS-0v; Tue, 12 Aug 2025 05:06:15 -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-0006mH-0m 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 1ulkxK-0001H0-9V 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=+T7ASoP0cNvOjEThZFpWOQ9yxdbrd92okcosRYWbUkw=; b=opEPk2eMFg0AeblMOqwyWEHOwu1wSwo58fDl4HvGc5sUN0qGXknqy3sDYbCVzm2xOhpQnQL7rcVNUWGos/jh3NtCz2ThlZiEJbd93dDN+B4iInzH/7rQc83TkzBbnzHXyToh5jYpcNMJS+uv1SmYyazY25ClHjaslXEdIgylLox6HOcu2VFKPWCK/9YGcOFBH5OiHNrB/zLl3guyqseNsHjb8L8EvyEnuGmrvbrc8EeNXzlDn6vgWCO9BJHQ+Kz8yXgBnkEX7XVTaImnadXbI1JfF1qd9ueylybo3dbPvS06bNaeuzr+ZsEPlgBsBew0cIg/grYAJZuvbwVC+IH0fg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxK-0007gO-3o for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 06/43] build-system: asdf: Redefine asdf-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:06 +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.175498952629127 (code B ref 79224); Tue, 12 Aug 2025 09:06:06 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:26 +0000 Received: from localhost ([127.0.0.1]:51764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwf-0007Zd-2Y for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:25 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:52579) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwT-0007SO-0i for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:14 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZH1NjNz5yRf; Tue, 12 Aug 2025 09:05:11 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.150]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZH0LH0z1xqp; Tue, 12 Aug 2025 09:05:11 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 80EB33E325E; Tue, 12 Aug 2025 09:05:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R002ddf96cf1-8857-4454-a68b-c0ea713c0866, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:14 +0200 Message-ID: <20250812090457.19016-6-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: 272186306636866274 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 14 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludegmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=+T7ASoP0cNvOjEThZFpWOQ9yxdbrd92okcosRYWbUkw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989511; v=1; b=C2UuF2K8ajz1DssxEfu6wk2/PTQUmYKc3uzxwy8aSUuWAGIWgxWFNayAhHY9hiKDrbr0s4J2 Qb1d4pq5d23GhTXV0NZqbvGZINx+QUxyTrKS2umq8bKRnjfI7tU0KYFX7KelUx6Y79TXA8K/ORx YDEoRxP1Sil5uS/nGsfjdgWQFMVdyGk/Rzogw0b1oIsYbCkRcno7/P/Idugecp/5K7IKcsCHuP7 X4l5tDoMuredtx8Z2Mvh3L6OFs2DFs7BsDBD6iV3tnAwvlRVGcWBv2zVPGqSM8JSfWmge+vot6z enormeZKq5UwGbSC95vBbhMu0ku2hPj8PYJdUl8cqszYA== 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/asdf.scm (asdf-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ifdd57c4e5279d110ee7c670090b3ae4089703659 --- guix/build-system/asdf.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 5ce63d106fd..a4ff851dbb7 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2022 Pierre Neidhardt +;;; Copyright © 2024 Nicolas Graves ;;; Copyright © 2025 jgart ;;; ;;; This file is part of GNU Guix. @@ -329,11 +330,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile)))) + (mbegin %store-monad + (return builder)))) (define asdf-build-system/sbcl (build-system From patchwork Tue Aug 12 09:04:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43368 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 CCF8727BC4B; Tue, 12 Aug 2025 10:07:22 +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 47D6427BC49 for ; Tue, 12 Aug 2025 10:07:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxw-00074p-Lr; Tue, 12 Aug 2025 05:06:45 -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 1ulkxO-0006mA-VF 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 1ulkxK-0001H3-UT 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=xn4CeUcr47fF8jYh/84rkt/YeKTcRXrsxrOH3UYDoK0=; b=KwhcXuVVVzvxcHJcVZG4flCk61V+ve9a11hadrLL6kd59JlpV36PMl5PjTaqU4GHeSFDeFUy5XEDTXewZZJPuPSJJgIK7bO3cKkVWG2r0DQfFZN4WZAMCC1uGxiQWcmQdXvF+d9SL6/yWwdZyA8AcyUaXX5F0hyOes4XzTRIYLZ+17Quq7xuHxYiCstm+IiAf4krHNgzSVoCl0UFLPs/02NWHgFozIS51KRjv3DM+vAss+dUsHImnZsBqK9UIU8aYD6g5Rh/ek8Y4+We7By60GuhoJERWEHTXUTQ26SNRRJ38Fjx5j4PGQH74yLaJ53+Ey4iePAcitpGrsTENoQ6mw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxK-0007gX-MK for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 07/43] build-system: cargo: Redefine cargo-build and cargo-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:06 +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.175498952729141 (code B ref 79224); Tue, 12 Aug 2025 09:06:06 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:27 +0000 Received: from localhost ([127.0.0.1]:51768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwg-0007Zr-C8 for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:27 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]:54159) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwU-0007TO-Kk for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:16 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZJ5KLQz20gM; Tue, 12 Aug 2025 09:05:12 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:12 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.159]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZJ4JLkz1xqp; Tue, 12 Aug 2025 09:05:12 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 268B18E327F; Tue, 12 Aug 2025 09:05:12 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-113S0078abbdb65-1403-4f77-966c-71ab22fb61e0, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:15 +0200 Message-ID: <20250812090457.19016-7-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: 272467781418869474 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=xn4CeUcr47fF8jYh/84rkt/YeKTcRXrsxrOH3UYDoK0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989512; v=1; b=qidoC2r4hygqp/YqZvp0alCw5TAHDxwDHOqMB85iF0cAl6j6uhNludFUvCsvoalc0ycvQGzu sB2vlYME2eXdsHCXKRd90KQekvLg/gBaRoMCO7RAVcWGO6QYTPhdmV9CwyLcYR6UjJTGQZdcw5m hnVcfViLuRL2Zn0bP1L/P7/QtO7OJtr51UrAabbk81F3NpcEqqaSGReWG9YdzKU0kMYGD643QVm atYMJUaVYuxoe98LY9v+VQkJO2aDwensU+uAMVCUWraES4vN9Ikv9WqiyoQuk6MfrU/3SoPMjT0 RJbOcRfptt9GaRueTbxGsRgr6pw7KMAT1OrVYrAqaev1g== 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/cargo.scm (cargo-build): Monadic procedure returns a gexp instead of a derivation. (cargo-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: If1151e9222170f2eb3a92d43debc61c696c2e72d --- guix/build-system/cargo.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 452f7f78d01..4d130ab7066 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021, 2024 Efraim Flashner ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,11 +140,8 @@ (define builder (map search-path-specification->sexp search-paths)))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define* (cargo-cross-build name #:key @@ -205,14 +203,11 @@ (define builder (map search-path-specification->sexp search-paths)) #:native-search-paths '#$(sexp->gexp - (map search-path-specification->sexp - native-search-paths)))))) + (map search-path-specification->sexp + native-search-paths)))))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define (package-cargo-inputs p) (apply From patchwork Tue Aug 12 09:04:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43355 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 1BC5F27BC4A; Tue, 12 Aug 2025 10:06:47 +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 EDF7127BC49 for ; Tue, 12 Aug 2025 10:06:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxU-0006pR-Gl; 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-0006mG-0q 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 1ulkxL-0001H6-NI 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=YX1XMuJRnHOHyQjve3us/+l5L7IfzkYd9JwKq4FsDu0=; b=MfQp8sCQ67WU3xhE3YtzapxqrSIGD8kc5GEvQjbZcw95C+B1WD+K4hbZ52jx5ng14QhHMMnMSs7xGOAF9xui1De1TiVb1Jt4wUlTgHlI8oCG2BDQnf3Ohzfhs/thgNhXa5CVjT5Y112ZoWowDSAlNbORL8D0EultrW7Gh1XRveOzynY69vOSkCNo1v4+tzyzSh2ByTur+E1OGb0qVf/+o97UY7NLV7+msEEIiNIHNyBb5DYisqg4sFHpJ+JFvYT2JF0nm03bf2pRIujhd7mLUpENmARIbej01EBmG2dz3uZP9L0czmxbgTlSCva+v1VQhEZRruxEYbZtedjpsvTFDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxL-0007gj-EV for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 08/43] build-system: chicken: Redefine chicken-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:07 +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.175498952729150 (code B ref 79224); Tue, 12 Aug 2025 09:06:07 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:27 +0000 Received: from localhost ([127.0.0.1]:51770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwh-0007a4-CT for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:27 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:36675) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwW-0007V5-P2 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:18 -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 4c1QZL6bYVz5yTT; Tue, 12 Aug 2025 09:05:14 +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:14 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.37.103]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZL4GVFz5xQq; Tue, 12 Aug 2025 09:05:14 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 088D994325C; Tue, 12 Aug 2025 09:05:13 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S00349b461c8-c1ad-43e6-9c15-87440c4f4afc, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:16 +0200 Message-ID: <20250812090457.19016-8-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: 273030731700822754 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=YX1XMuJRnHOHyQjve3us/+l5L7IfzkYd9JwKq4FsDu0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989515; v=1; b=3mvIxa58etdaIxDrBLrRRhmYT+fqi+tdAVzyy1k5dvmiXA7dFSQq8NFjVJueR7GhRIz82RtP TW/h3HEa1ToIvQXQ5owX4KmMNzB1STFK2qp+8ilmfkhG+G1x9QA3sIuQqrkY67nHUJhSnTVB1sT yN4T1j8w7npdFOBDg7B58aYK3AL1nAakpM1nCn1DbEdALzV8pMD24bZPMy0aaWw7SE5PlvooCY2 UIhuErSx4hOgzDaZxl83NBzUDnHNINyVjCOSYGKqvg0mpo3bR065comu9y2SZE0iwZN62yMs+ao PN+wTqsh9LQXgA6ZYi3Q34BrI36Kx7t9kDdAIVbR9Y8vg== 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/chicken.scm (chicken-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I6a837f198ac6c371b08f8690ff5bea68dbad2b54 --- guix/build-system/chicken.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm index e6fcfa7ee30..5c4a7f45bba 100644 --- a/guix/build-system/chicken.scm +++ b/guix/build-system/chicken.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,11 +114,8 @@ (define builder #:tests? #$tests? #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define chicken-build-system (build-system From patchwork Tue Aug 12 09:04:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43364 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 5642C27BC4A; Tue, 12 Aug 2025 10:07:14 +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 3189527BC49 for ; Tue, 12 Aug 2025 10:07:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxR-0006ns-ET; Tue, 12 Aug 2025 05:06:13 -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-0006mF-0m 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 1ulkxN-0001H9-8V 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=DbiesCDqdSIVQVIzzAJFTsIRxhPcThe6FwpFtEZLkpw=; b=gfGMZy0o/qKxoq3k81ViTAUGD0SvoBI2aLFdo8YHmDHyR4jftoAASO6sjPxds8r6rAOQAR1AKkYwqnuFj+zqyNSjv+CcEbU9GwfMfVDzMmRHRbOAiqLSIAGd2CYcSgOASnMxm6/i+uOWVrxGtQRHlDsFUiZGp+ksqwFX+zEWldfT1AZNPlHiBE4m7h33ZvNgRiowPyqfPc4gy5gUmduVicFEm5w/Px36f4y6vONY4gJtlG5o31HTjVtDnjX4N7bgBDAAbiP+CD+vIQIGzwfINFjwxwGzkHb3vozttLGY75geXZX1DXJYb8g1cVGiJfFLBrbN/8zlwnmIavvuYFuX2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxM-0007gw-1P for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 09/43] build-system: clojure: Redefine clojure-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:07 +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.175498952829163 (code B ref 79224); Tue, 12 Aug 2025 09:06:07 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:28 +0000 Received: from localhost ([127.0.0.1]:51774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwh-0007aC-Tt for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:28 -0400 Received: from 8.mo563.mail-out.ovh.net ([46.105.60.197]:45079) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwZ-0007XO-D5 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:20 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZP126Pz5wwm; Tue, 12 Aug 2025 09:05:17 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:16 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.67]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZN5KzSz5wDm; Tue, 12 Aug 2025 09:05:16 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id AB1E93E3160; Tue, 12 Aug 2025 09:05:15 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G006beb8a214-542c-4b2b-8bd8-6e322b573554, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:17 +0200 Message-ID: <20250812090457.19016-9-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: 273593677502210786 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=DbiesCDqdSIVQVIzzAJFTsIRxhPcThe6FwpFtEZLkpw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989517; v=1; b=BGqnxBxaqcn9T7edfp/5/41yq6OzdgRAPaLQR0BDEXAFgxr2Q8HVfda90qyZiuYZJFPgvb0e IkOwurgejDbmRG//Pj+paoHHHE7PDchYkWlPcZ5C+p7tpbywfyAA+oxUF3QRs4V6RVs4K3BodCe HX71Lknw82lWYdgUPVOAgWNCn0n9hjfbAi6DdfbvVIJ/HcFB6RpQgmI/G1fw7IZIEATjGO4ByEg OdfVePBrJAjU3rGvutwd1ZXSAMf0LQugS967lAwmT/IFwkzlYy3x3tJ3JaM7rjxWNkimsDnbnhv TX0qvZaWF1Ry9CwA0/NDrc20wXyi2oqEKUDh75STEyNqA== 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/clojure.scm (clojure-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I5b5b552052cfffc45bc4d82871600b322eb23d85 --- guix/build-system/clojure.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index 037fcaf21d9..cddcf8304e6 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2020, 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,11 +170,8 @@ (define builder #:system #$system #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define clojure-build-system (build-system From patchwork Tue Aug 12 09:04:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43361 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 CC39D27BC49; Tue, 12 Aug 2025 10:07:03 +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=unavailable 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 3A6E227BC4A for ; Tue, 12 Aug 2025 10:07:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxR-0006ne-4R; Tue, 12 Aug 2025 05:06:13 -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 1ulkxO-0006m8-TE for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:10 -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 1ulkxM-0001HF-Qb 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=sy/2TyyQ+r5ktPRBPnt1B/6MCMelg+iriIKs2cM5FNk=; b=skng2nEM1LzI81Y5UlNW+GP92W/Ew51yBuRSlejcNO97l1AmvTRnsKkvoZEM21fsb7vU2I/b6KM+gmS3A/qOYVRevqZrYEO/Yiay3xMypT5t1ht0Ztrz6FQ7i620R1VBqcKaUV0PCOykqHC2Upwn3m8ABJkmewFPocmqm3iSRqGiJ818EddesCtXHmW+Z0uhIKVNVANfLGnkLtqcFb9bNSS6OAPGzhisrSFc2PsXA8AwY1aIu7/IWLcmZg417BBZs4J6HBYHjDJANdt/zPOsEtxeQsUuz1m/Cixvsv7g1MGGCLGgcvRZL2dKY9ALTUs8JzGrllTUQsBpOKrwdTQ5Kg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxM-0007h4-Ib for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 10/43] build-system: cmake: Redefine cmake-build and cmake-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:08 +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.175498952929170 (code B ref 79224); Tue, 12 Aug 2025 09:06:08 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:29 +0000 Received: from localhost ([127.0.0.1]:51776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwi-0007aJ-LB for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:29 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:52905) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwa-0007YO-8A for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:21 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZQ4G6Yz5yC3; Tue, 12 Aug 2025 09:05:18 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:18 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.243]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZQ3LxFz1xqG; Tue, 12 Aug 2025 09:05:18 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id CAA9E9A3280; Tue, 12 Aug 2025 09:05:17 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0060fc37840-5c65-4b48-b274-f60663f8edc2, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:18 +0200 Message-ID: <20250812090457.19016-10-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: 274156630802686690 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=sy/2TyyQ+r5ktPRBPnt1B/6MCMelg+iriIKs2cM5FNk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989518; v=1; b=pqltooBsAYyR4VFjUtyi3WC+6KalSD4w/kbXCbz1OV55J0yzT6sDOWMbPcKg858RntfZzZHW TCjRHl9Vhnu0fLuYGjydfYYZM1WlAkZbpAQzUpauUvfmGs4d0AQUnraO5qDnar2B39GmzSRbOz6 7SaLu2F6Av5ltuPFPqsBjG43TW3Cu1LTlh6ZXWifAFDPSvjIFgMFtOKbzyDGBxVepdRrO8K7cK/ NAJVhLqE42stLNXMfDJKHCM8eWCaQcfI9+JTxc/tpCUYVEfyi6Mz/dHDzegHrlDfkqPpLz5At/0 wH6+lUDchGwqrnniExs2Dt14JutPBtQkAR9ufEEyHtL6w== 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/cmake.scm (cmake-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I0c3ceb08391a38c52521416093d2c4b2ae869165 --- guix/build-system/cmake.scm | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index b0587fddf02..ff67e8b6735 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2025 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -147,7 +148,7 @@ (define* (cmake-build name inputs disallowed-references) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -182,16 +183,8 @@ (define build #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #: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))) ;;; @@ -290,16 +283,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 cmake-build-system (build-system From patchwork Tue Aug 12 09:04:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43354 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 4AD9427BC4A; Tue, 12 Aug 2025 10:06:44 +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 1A02927BC49 for ; Tue, 12 Aug 2025 10:06:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxU-0006po-WC; Tue, 12 Aug 2025 05:06:18 -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 1ulkxQ-0006nN-2a for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -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 1ulkxN-0001HJ-A9 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=YbhbPPZZGtBeetxlT9h0U17IKZtlSFiA5hMG5b/otLk=; b=Xw6ZvbQ4YJWf++m/8Kvt1B3N1/YZCKW2gAAz1PiJnRlGvlCIBWw1yUASw9ZB8pN/dmDaaaNeE1TG7rMUmRlr+erSY7Ru4q1zvYWOJNGEXfSgOJla10b+ZPkjEM+wnuir1eXnNPd6bYAldMKL76kptlF9nMLvHtA2vm5B+wa8d4O//baehcyPrj1g74Nn6SIHGuxMbQhVJ39IBsRvOJMGqGGbNy+PPKSlHPcIl3/sCwCevcVY2KKV5vyulZKsRIGAzmKZftfT6VBZ4aNyEq/P/GAzcuqsnbSO+hbdG1G7HmYHxXd52YanoG3M1bMtBCNqiidn002YuiPiN9fqRziEmA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxN-0007hC-2n for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 11/43] build-system: composer: Redefine composer-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:09 +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.175498954429254 (code B ref 79224); Tue, 12 Aug 2025 09:06:09 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:44 +0000 Received: from localhost ([127.0.0.1]:51796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwx-0007bk-HL for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:43 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:52307) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwc-0007ZJ-7F for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:23 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZS2wg1z211G; Tue, 12 Aug 2025 09:05:20 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:20 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.254.220]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZS1yCnz1xwd; Tue, 12 Aug 2025 09:05:20 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 4BED59A326C; Tue, 12 Aug 2025 09:05:19 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-96R001324b97ed-322b-4aab-ba3d-202128c72a38, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:19 +0200 Message-ID: <20250812090457.19016-11-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: 274719580933382882 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=YbhbPPZZGtBeetxlT9h0U17IKZtlSFiA5hMG5b/otLk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989520; v=1; b=o3nSDfTAeh8xusliV0gVRJ3zQ11EMrCO+kzpHxWjXku1ctE07duI+X6Xlvd8+1bQVoNhSZW7 8cR1rauhl7ChTJYUZDKcqa1EKPMADJWlu4HZ7aq4QBRfxofe/3ZgOlMduz9A80tciNLvhx97/Lo UaGRcPa5SCE9gR3rORwB8H0Z6PEKu5ONk1ndvgTXenh+EYkGk1qRsc6z2AXpxP79Ebw5e2YSMDe nAXUGOeoTadgQvfVH7y8a/57MDQFwjjvzIFm2Yu5FauTzPasuj/Lc/2oENntgGXAUEMjw/Z9ZmQ klpApWUDTdr3HdiZj0hrAffVMVgNv3DK7DoBBVe03feMg== 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/composer.scm (composer-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ib7787a5116744e61e3d0afeac6d85f61c6b6c9c4 --- guix/build-system/composer.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/composer.scm b/guix/build-system/composer.scm index 48ad90f253e..ceb2bf68801 100644 --- a/guix/build-system/composer.scm +++ b/guix/build-system/composer.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2023-2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ (define-module (guix build-system composer) #:use-module (guix store) + #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix derivations) #:use-module (guix search-paths) @@ -151,11 +153,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define composer-build-system (build-system From patchwork Tue Aug 12 09:04:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43352 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 9355227BC4A; Tue, 12 Aug 2025 10:06:31 +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=unavailable 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 A53C127BC49 for ; Tue, 12 Aug 2025 10:06:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxU-0006pp-Vx; Tue, 12 Aug 2025 05:06:18 -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 1ulkxO-0006mD-WD 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 1ulkxN-0001HR-TQ 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=rrnqq/XRldbdf1SkGHOysqvL5gx/N53CEewwLyUjgBw=; b=T4gpFtbVsO0sydBhRgMtcaZpVR9/WxCFYKbrzplJXuWx5v+KoEn7NjQKLwtqkve5HIWnjC740sc1loAaKjOU1VW4Nw9CDxB6CPgeHyg4TmOxRwkBhAPHgYvQDSztie0xaOrxKvL+wWkh5Ud20IlfHSGwqgJq21txaTl99t9+NGFpbgZAuaQEDvQ1Z6Al8bGbGd4oCA8uTUPv0IZ05ZmlxjyWdHjvI3UOv9G44AY8AKys5Q5HS9xUJtQsrMqOM1wWrpUHD+JpcXS0GXqSlIAtTyEt2tc8xzDCX/bY7WFfbgDGNfTQhmqCrHKUyKs8THefMvykf0vPMpkjBZAisqEmew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxN-0007hO-Lp for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 12/43] build-system: copy: Redefine copy-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:09 +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.175498954929294 (code B ref 79224); Tue, 12 Aug 2025 09:06:09 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:49 +0000 Received: from localhost ([127.0.0.1]:51804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkx3-0007cP-Fe for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:49 -0400 Received: from 10.mo562.mail-out.ovh.net ([46.105.72.220]:36365) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwe-0007ZU-EP for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:25 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZV3Hmlz1y8c; Tue, 12 Aug 2025 09:05:22 +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:22 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.243]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZV0vbhz5wGk; Tue, 12 Aug 2025 09:05:22 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8673A783281; Tue, 12 Aug 2025 09:05:21 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-112S006855ea233-d36f-49a4-9378-f61f010d358c, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:20 +0200 Message-ID: <20250812090457.19016-12-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: 275282527855567586 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=rrnqq/XRldbdf1SkGHOysqvL5gx/N53CEewwLyUjgBw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989522; v=1; b=C3IixZ+DbXj+bADb+sdht7tdtQV1JSLKU2FlHBoILbN94UPAUB1aduVJI2KFA8heVeREAlcx wimv4bOdvZMJnRCKaJJqDTvfvCQbEBS17lUijraIzeYhMSjHDnsT3+lQxWPBMOY+nOptsedXpKy 1lj+jO8NZHJ8esB+ct3Ocn5XQ5z7x0IB2rFY8DOBYlig7f4b/s7+2EcRGwmj1QpOYcIJx6tpYxj ofd08WtwYSjwljhizxoCPGzPWkbBr0DkVVTa0K/ExViy1Qjw8xhlw1HPHvHuefi5iSbceZvYxlu l/Te1ObW1N6VUjIsd9nPAj4+4qu2sWz2sj9mbpFHWHXTQ== 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/copy.scm (copy-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I96dfa099501796df007143db63a49e2adedbee92 --- guix/build-system/copy.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index 1f2937e0f18..ec0f3d95423 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2021, 2022 Ludovic Courtès ;;; Copyright © 2023 Jonathan Brielmaier +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,14 +127,8 @@ (define builder #: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 #f - #:substitutable? substitutable? - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define copy-build-system (build-system From patchwork Tue Aug 12 09:04:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43362 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 1AA6127BC4B; Tue, 12 Aug 2025 10:07:06 +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=unavailable 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 CC6A827BC49 for ; Tue, 12 Aug 2025 10:07:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxU-0006pQ-GF; 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 1ulkxQ-0006mI-2R for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -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 1ulkxO-0001HW-G9 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=ybZA0DK2FNzSEop+OxV3wVezGwEPMJlANAJxxek0nys=; b=bZPw7RfT9IyriPOiyXgNWz12gPOosDJPyEMV9TKCQV34v2XvskKHIlIQKyq6VmUeEffxlOkxFyE7AZ4YO1eD1FJbNg7va24shaGWRX1HCYAWi2+cm0DiqweJE2my3rbLnnI6nkeWZuRwqUeQkuxf5N26gOPAbt/59VplaTYO8fK0pr08Op5MfELH6sfF29b4r4+EtYXzkNHN50UfqSXrSfbxN6pG5/V4hHgVHUl0KMJ/gqt6DP7i5fRGwqmTS3vqfqGzay4O2BCKGxEMK2b5p8AQccGxF+PjO0c0JI0X01npgzHgCbq53/A3VANwwlL+3Fe/XBB/U2PmR7n4iGoOAg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxO-0007hc-7f for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 13/43] build-system: dub: Redefine dub-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:10 +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.175498955429324 (code B ref 79224); Tue, 12 Aug 2025 09:06:10 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:54 +0000 Received: from localhost ([127.0.0.1]:51812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkx8-0007cn-43 for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:54 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:49903) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwf-0007Zb-N0 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:26 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZW6wQZz5wwm; Tue, 12 Aug 2025 09:05:23 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:23 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.249.1]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZW61nQz1xqh; Tue, 12 Aug 2025 09:05:23 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id EEC6EB8325D; Tue, 12 Aug 2025 09:05:22 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G0039e117d9f-17af-4e19-bdb8-1da2b044dbaa, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:21 +0200 Message-ID: <20250812090457.19016-13-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: 275564002597790434 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ybZA0DK2FNzSEop+OxV3wVezGwEPMJlANAJxxek0nys=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989524; v=1; b=FQ/d4UI+q1dMDab29dMTTJwieaDYmJhzJM6ZpXrFAWWEscIcaf6vQzoheRKdxmha3PMavCCg Jd/uIRz1m9h1YGrOVczAGmGMhs43RtalxM+hc8ts3auUwhqCO58ZH1+UOkjEAYjbovHCCFkj+BK BYYMvfS4w/cMg3c/kiT7tTIkKVjQxY0Ca7QTw2KwJiOiB1SJmqDycA9a61rCfs7Yrc7Jjjjv7TT D+AqR6U+3maDiZET3s9k/UQYv0i+2GutNaz8oebCJaDWOVF7j0LXP/b/EFYpCSEPb0bd/KkshsN Dx0+ZZnKLt1c2SaF2vQacUY2ZDQ8u3+sFGX1hZ173EunQ== 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/dub.scm (dub-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I678a7287172157688b95cab00175e61852a99c58 --- guix/build-system/dub.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index 831a34af0d1..170f247e5d0 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,11 +94,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (lower name #:key source inputs native-inputs outputs system target From patchwork Tue Aug 12 09:04:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43360 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 4328027BC4B; Tue, 12 Aug 2025 10:07:01 +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 E87AD27BC49 for ; Tue, 12 Aug 2025 10:07:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxT-0006og-1t; Tue, 12 Aug 2025 05:06:15 -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 1ulkxQ-0006nW-KA for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:12 -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 1ulkxQ-0001If-46 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:12 -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=kCmIiN3+YnQUrYY+q8IGyazd0tWF9VhwfrRpMFtuaJU=; b=oUTwoMLfJlMysVdY3iZp7TJke9nxEBVkRHbOx9vy/SEiaUgiYiCcCM4ad6HXLYyrA+zvR+Rl/DVzIkoPypBp29NQt3keFlSjfQpLLOEOB5E9r94Gl8/GbJ3F9/1qsoSKEMLg9lOUjGsUlswniS9E6sy1wl4AemWx7LdiVrPCASSpNRVA9WPp9GoI2Z2sgCN3jw1YOHDHKSJhIjk9dvHDFbDMq00CV2nJx5rlMfvlAF0hFg+seFAZeLQS2uQq7ujR4N1OJXHNbFB6yHyzCFnqqfQM73vRfJaCPl3O6aXJYoyV0fwP2KB4YSoS4ijpRYyQp1FLhh9OOF6v5RkR4MfX3g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxO-0007hj-Rq for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 14/43] build-system: dune: Redefine dune-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:10 +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.175498955529333 (code B ref 79224); Tue, 12 Aug 2025 09:06:10 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:55 +0000 Received: from localhost ([127.0.0.1]:51814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkx8-0007d0-SQ for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:55 -0400 Received: from 3.mo562.mail-out.ovh.net ([46.105.33.63]:58109) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwh-0007Zp-Fx for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:31 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZY5Glcz20sq; Tue, 12 Aug 2025 09:05:25 +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:25 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.254.220]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZY3Gqnz5wHb; Tue, 12 Aug 2025 09:05:25 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id F04F994325C; Tue, 12 Aug 2025 09:05:24 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G005d26e17e1-0547-45a0-810b-3e47818b7e16, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:22 +0200 Message-ID: <20250812090457.19016-14-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: 276126953400427234 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=kCmIiN3+YnQUrYY+q8IGyazd0tWF9VhwfrRpMFtuaJU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989525; v=1; b=PFmpJNADfhLf388jXnRqktz9HsUimoMzRB8l+eKVqddcTal/O/6uDtOwVhqVRQEeJhOzdY9Z yFi4dDmiy800mJVKGNQSw7/ea2RtQzAMz0w0LLN2+XojECsF8kInCHKEQB7UYq01A6KHXaxK1vW evNR1AJINwvGcSJycJvXGHkLhEuE+M81Nr39BhGv7SOhzHz9DJAnq2HBw2xea1csswYQYOUc/+l seARMcYvt65g0s3anIBu2UuTX12z7sv9pRcybTUMOVHQ/nDvVNtdUrOOWXhrs7TPWUwgeTAQ16r Yg0LG7j7C4lOP2Fd6zu4amvmOj3S7/3SpCLQCV8XHeRiw== 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/dune.scm (dune-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I2a0a9a771afbe491538ed50aeb47b9fa4fd9341b --- guix/build-system/dune.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index c45f3083493..990d94db0f6 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2021, 2022 Ludovic Courtès ;;; Copyright © 2021 pukkamustard +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (guix build-system dune) #:use-module (guix store) + #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix search-paths) @@ -152,11 +154,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define dune-build-system (build-system From patchwork Tue Aug 12 09:04:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43382 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 BBEA827BC4C; Tue, 12 Aug 2025 10:07:51 +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=unavailable 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 8A6FF27BC4A for ; Tue, 12 Aug 2025 10:07:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxx-000769-3L; Tue, 12 Aug 2025 05:06:46 -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 1ulkxQ-0006nS-93 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -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 1ulkxP-0001Ia-S0 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:11 -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=w4Y84vaP4P48Z2Ir4uRoxcwsWe+vKj6KYBEXAe6SYQU=; b=EKOe4DL901ovQP09IG5a4V3WvRmtO3rDp99oY8Mer3MJBPMad7nhenYsnm+aV5N5zllGAEcSQJNMMkYRijeP0IUAhCOWxNcWXQGZAgdAIyI/7yHW13MlJG2U7r7Q6uyurnyEZJo8sLxUL8+dCWt7GtLh5CkRA1fuAiLaUpbzSzWD3/kpc/YHijlRaZVsR+JeRrQoicCLbXTDCpd0dXUzY6FSHuxkl6BDBKDAasV6DkRh3lMEdN12lBVrFt3YHok7WuMhv/QAcL6vgymJG/biEI1IHBzD1yzf6xiNSZHhbHwIzRAD8YTVYM/ZVcO5QM6jQoB7RoonLAykXYJqKn2u6Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxP-0007ht-Lc for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 15/43] build-system: elm: Redefine elm-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:11 +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.175498955629346 (code B ref 79224); Tue, 12 Aug 2025 09:06:11 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:56 +0000 Received: from localhost ([127.0.0.1]:51818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkx9-0007d9-JA for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:56 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:44601) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwk-0007aP-F1 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:31 -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 4c1QZc31tRz5yl8; Tue, 12 Aug 2025 09:05:28 +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:28 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.227]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZc0kvqz5wGk; Tue, 12 Aug 2025 09:05:28 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 36BF83E3160; Tue, 12 Aug 2025 09:05:26 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S0018ea8e855-8ca0-46d2-96e4-7060b31100cb, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:23 +0200 Message-ID: <20250812090457.19016-15-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: 276971377284473570 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=w4Y84vaP4P48Z2Ir4uRoxcwsWe+vKj6KYBEXAe6SYQU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989528; v=1; b=ZkVKPL70bevzM0m1aECb61uEq0iPZFRD3VZju/ni7lV8ZQHBHTy9RmbaOQFLC2saRrNqnAW6 89hPm4SeACUHrmKjo7mVYy4VPXzw0H9LOOyKABpk5sw6qqD7p3JTtOFe+YtXHS1iQ6n9Wx9GuDB 2P4WLYJE6NP4UTZ+yBwRjYkSnLEXpwuu5XRGgDTLALAut4dzrBVb+l8//fDHl63bF4QI3ttG+Py SUge3rh9Cx5U1e4jfl9LLUdFDD9ZJHl6/3aQfGG+7uJWRjVKesxGpYE/0tEkYkDz/4JSP3PI2Sh X555l+uzCpH+B+1DrEIAD1iFCQ/FUD1d4q50wGna8HSyQ== 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/elm.scm (elm-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I9d45b254d5e8fdc337d075e7394e3354c9186ea6 --- guix/build-system/elm.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/elm.scm b/guix/build-system/elm.scm index 7405db3d985..aa842ca9c63 100644 --- a/guix/build-system/elm.scm +++ b/guix/build-system/elm.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Philip McGrath +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -193,11 +194,8 @@ (define builder (map search-path-specification->sexp search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define elm-build-system (build-system From patchwork Tue Aug 12 09:04:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43358 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 94BE627BC4A; Tue, 12 Aug 2025 10:06:57 +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=unavailable 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 741F527BC49 for ; Tue, 12 Aug 2025 10:06:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxv-00072k-DO; Tue, 12 Aug 2025 05:06:43 -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 1ulkxQ-0006nd-Uz for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -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 1ulkxQ-0001Ip-B2 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:12 -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=TAQEkCzqq4Ly2Gsk7HHsISBaqf5bftd3D8pL0J2iiFQ=; b=M1eTJnf3YOQujeYu9kcMdRB8UKd1d0Gfd5AmWgFdGGgbT2bhb06LdC43H1ImbLlpzkxkgwVNVffJXlYokIc5qwDvrkV8PV3brVUmIpWFlwbu53lY2XRL2FY0zg74b5UJmDH+Xb8sV2HhxhuBJE+bvxDtjGgiWmW1Gfa/XG0DrhanvvcoxEzPJNwf4693OC1M2S0THuXynKMlRMpjNv7ecz6lmetyrS/awvfV+YVRb3Wo4Sbr40mg9NGKuJDzJ5X9rTciReZuP/Z5pLYXYVffwQnePyou8rrDvT2trnGGjhBit8olBz+rCVNtJ0foiMUySrD9N8iS7ck0EDQ88bQQPQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxQ-0007i5-2R for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 16/43] build-system: emacs: Redefine emacs-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:12 +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.175498955629355 (code B ref 79224); Tue, 12 Aug 2025 09:06:12 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:56 +0000 Received: from localhost ([127.0.0.1]:51820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxA-0007dM-7Y for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:56 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:48957) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwl-0007aY-Cn for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:32 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZd500hz5ylY; Tue, 12 Aug 2025 09:05:29 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:29 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.251]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZd3Z1Hz1xqp; Tue, 12 Aug 2025 09:05:29 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 0BD743E3160; Tue, 12 Aug 2025 09:05:28 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G00555058b6b-2a52-4203-90c6-af6b0f60b04c, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:24 +0200 Message-ID: <20250812090457.19016-16-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: 277252854217695970 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=TAQEkCzqq4Ly2Gsk7HHsISBaqf5bftd3D8pL0J2iiFQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989529; v=1; b=kHnbzE4yb+iBDs5/U94rW6L9BW+JbFVRoh3sSG9oiBWoNvYugPdRdKrFklH4p03QaUUUE5h4 QPQ9VYn+6SFyvQoqf7Lrkc04GS1UQT1SXYMy3n7zjzgC030FQiQg2P8dwWm7K2FMul5S/XbX515 uluThvYk7hHWPLhDw95YnsZPD3qHtgdcyHpckbOR+uPu4vLr+PZ57+BknYSBmr6VDRGkGj4CMvE RxlCUbAzkqz33F1czjL5GkUoP3aXl59KwC38Rm4TK1mmPb2J872N//FFOEj8Ho/Kle1daa3w6E6 kaXo9Iahf1RqL1Q37+MjWjMgdX54UzRNQAeJDUTrkC+ng== 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/emacs.scm (emacs-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I89cc8c1171eef7c5e02e35df5e1298ce3813c1b5 --- guix/build-system/emacs.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index 61b9c171b44..607a1b84bcd 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,13 +121,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define emacs-build-system (build-system From patchwork Tue Aug 12 09:04:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43356 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 704D427BC4A; Tue, 12 Aug 2025 10:06:49 +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=unavailable 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 503DF27BC49 for ; Tue, 12 Aug 2025 10:06:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxm-0006zY-KC; Tue, 12 Aug 2025 05:06:34 -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 1ulkxR-0006nk-8a for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -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 1ulkxQ-0001Iy-Qc for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:12 -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=jE6D4rRMLRhWB8lcsuLuOF/47gNWfaT19/HiGC5V2Q0=; b=d3lSR55SGMq9DwgS7ZfgwbVopTMWLWuNT1IIDWRrGQ2owF/wRX4kjA3HR6f6GjRVnlievyxKuL/C3FJaJlx2Y1GhsuxeRPF9h44+nXQctyURVHYHOt/UMtSn02V5KEuJL6kNImFSV7FKcv3JXYLr0cMqGUau1r35llEEFbtWezDLCTv8ZWj3MGEOiKGcEEoxDlLBhynGkV+tiVH9muE4rIn/Jp/A2Njlh1Tz1uxKkNpRFESlFk5hlYnnlzVewxgEKDBgeyXVlgRwd/WhebwESi0esrvcBpI9fv3PpfkxEodMa6R6m1UbaXz0amxsrPVQOkFsmYTmOPW3ioaL0ICmdw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxQ-0007iD-IU for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 17/43] build-system: font: Redefine font-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:12 +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.175498955729363 (code B ref 79224); Tue, 12 Aug 2025 09:06:12 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:57 +0000 Received: from localhost ([127.0.0.1]:51822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxA-0007dV-Mp for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:57 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:59231) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwm-0007am-J4 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:33 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZg3tTHz5ycS; Tue, 12 Aug 2025 09:05:31 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:31 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.21]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZg2v6jz1xqh; Tue, 12 Aug 2025 09:05:31 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id C0CFA783281; Tue, 12 Aug 2025 09:05:30 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S001f724f28e-46de-4fbd-9ab1-823312d0b00e, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:25 +0200 Message-ID: <20250812090457.19016-17-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: 277815804652872418 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=jE6D4rRMLRhWB8lcsuLuOF/47gNWfaT19/HiGC5V2Q0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989531; v=1; b=L3xiL8aDpP41aUsfpVjsgEVzDSwjjMEURFz2DB1U40dDLuHIBo6Tj9fEgCJSE3hLcAgCFOnQ kb0xlJ8Vi77InZFOLNzsdkmHq/pDR8Ws3kx9psxMlJR3FDtJzznVlIXs/aiQZgqyVv5ShVXfdma 10dA4WIoxJcdz4ppL/ARp7g2ff2IawvW2IbBmPBTzks+cTKdUk1toiQrThRUgLomLeZfJk5uU+0 MLCASf8ScF4EztNjsM1FFLomNKAd92FHfO8IpWR1VM+TSQnPcAUt65fTzWXRRPZl7vNky8lmAil YlaQXo8nU62MjZKym9HnqR/5XahCnBGgU2zjKjI2nndYw== 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/font.scm (font-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I2a4838fc616e4ef8819b292d6842961284288867 --- guix/build-system/font.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index a4eeca00ca6..1cab4a4e9dd 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2022 Arun Isaac +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,13 +109,8 @@ (define builder search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define font-build-system (build-system From patchwork Tue Aug 12 09:04:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43367 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 11D3227BC4B; Tue, 12 Aug 2025 10:07:18 +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 9F2F127BC49 for ; Tue, 12 Aug 2025 10:07:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky0-0007Ax-OQ; Tue, 12 Aug 2025 05:06:48 -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 1ulkxS-0006oW-5h for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:14 -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 1ulkxR-0001JF-Qe for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -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=fs+sZ7fLBPMBLjzfD6YdfJolqU3rmXtTjtNF0fsAKe8=; b=f/3VkDKsYQJ3D49ALtRBZGwyo8DUXbb8P3PG0k+EfI10+Vv/PLlII7oaec4uh5UJT9Z05r8R8KjeHr/hsnHxPoDZSKKlz7un9NGnxZn0AK7xigliR46p0yioam9OHIkVxWAbzgraLlHlGQf8Gdu0CV+rv7V86P06w+DONCrduAJo4YMMOmXq7X353DcQsuDRXAFuYmYgzLxs48BhEBcIZFHlNHGxDApXK9c8LDT+EjnWMpyGldAg0cFA0SkuzopyzeeOaCzVi+Fths63lJoxbkEECogZa18G1lVOwrHZwRJj7+Sj2Vc1BfswTnH1Htgxa4dz+XdiFpIjuuk5pkZkBA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxR-0007iL-AK for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 18/43] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:13 +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.175498955729371 (code B ref 79224); Tue, 12 Aug 2025 09:06:13 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:57 +0000 Received: from localhost ([127.0.0.1]:51824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxB-0007dY-2f for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:57 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:55153) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwo-0007aw-9H for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:34 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZj1hwlz5wwm; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.13]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZj0W0Cz1xxB; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9414A94325D; Tue, 12 Aug 2025 09:05:32 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003a948ab61-5cc2-4e89-8837-05c30b204e6b, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:26 +0200 Message-ID: <20250812090457.19016-18-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: 278378756042253026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=fs+sZ7fLBPMBLjzfD6YdfJolqU3rmXtTjtNF0fsAKe8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989533; v=1; b=Um2HNxIov4qpMfdSE9d3zoMoKHSPIFeHzb1bKqM5R2WbP2Ao9+wWFx9K0tqbjXuXIWcDUNgJ 1ytYMb5k1aB6aQh88Ji+BY2kDIZgC5cuRoIg+H/mGMgukRIatMGhQEbau3wsCWUA9KPx2egVq8C C0dBMWzvTKGWeN+uuA/HdcH6/JJW2ptfHqBvXt2b6wjXI/M0bD2bs6P5YRCiRKPwg3CGjh1xwOs /2UC8nV5wtQS4IOfbKp8PwRw9qMey+qT8XluQOXjU/UNJipUTjRBoEoPQdK5wkKlB50o43CrpAl LdtRAVeeeS8VyIY2vdfC1W4JneQaQ62jfhTESP56kGcrA== 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/glib-or-gtk.scm (glib-or-gtk-build): Monadic procedure returns a gexp instead of a derivation. (glib-or-gtk-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I24f722e47f3ecce7132a7647b5689f6c10abbfd6 --- guix/build-system/glib-or-gtk.scm | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index c912adab4aa..1320bb5c052 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,7 +150,7 @@ (define* (glib-or-gtk-build name inputs allowed-references disallowed-references) "Build SOURCE with INPUTS. See GNU-BUILD for more details." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -181,16 +182,8 @@ (define build #:strip-directories #$strip-directories))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (glib-or-gtk-cross-build name #:key @@ -275,15 +268,8 @@ (define %outputs #: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 - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define glib-or-gtk-build-system (build-system From patchwork Tue Aug 12 09:04:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43373 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 899CD27BC4C; Tue, 12 Aug 2025 10:07:33 +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 0080827BC49 for ; Tue, 12 Aug 2025 10:07:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxw-00074m-B1; Tue, 12 Aug 2025 05:06:44 -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 1ulkxT-0006oq-EX for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:15 -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 1ulkxT-0001JO-44 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:15 -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=bVXTRMUbcB7tls+b/xtsUagkOFVwFO4Vxj6M8fwTsoo=; b=nE9GhyU/7pybLOdKFf0kJKLJF6JU5TRrKHvPwQzrvf4WxVK0Aqngdm9AVz23ynvQ0wixoGQ7mggdLKGSfsTxKyVUAX1gNf/NzMrhu1VQs+oSnQO7knQAvZb/Eg2xdYfs5HYwKJzn5izBq5sHnBZvNxgpHAFTLXKpCiwZU5TmI47BCc6YR6zODH6bI8cnWukXby34+RrXIn1Z9gk7acAxKfM6FarP+Ukg62CEuN7E57KdxNUt9b1ifdVNMJTpXL3VmTDtOKm22jQotcBXq6UoaSUzrk7zX1EU4rCqX96VbdBLUcICQe5yOQRmbUOQlh986DUCiUBca/XaMKf0nxnS9w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxR-0007iY-TD for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 19/43] build-system: go: Redefine go-build and go-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:13 +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.175498955829384 (code B ref 79224); Tue, 12 Aug 2025 09:06:13 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:58 +0000 Received: from localhost ([127.0.0.1]:51828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxB-0007dg-N5 for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:58 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:60439) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwp-0007b4-Py for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:36 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZk4R9Jz5yC3; Tue, 12 Aug 2025 09:05:34 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:34 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.205]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZk3S92z1xqp; Tue, 12 Aug 2025 09:05:34 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 0B7C08E327B; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G0056c8cb75a-451b-4919-9e64-6441752203fe, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:27 +0200 Message-ID: <20250812090457.19016-19-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: 278660228378976994 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=bVXTRMUbcB7tls+b/xtsUagkOFVwFO4Vxj6M8fwTsoo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989534; v=1; b=cymoPytPCw/mU+31tyb8D8ueAeK+JZRWmEld5QmD2+7tpOn1pu7xrPnM8r3owFxKOPLltZvu hJoZbzoJQvsyMp1r2OwmH2jBqNayNXC5rUl1UR8sy2LLdDVJMOCMNn0eWqmHWA1ktki9zjz2P4/ pwIa3C/w1/way3JeJEFdwmyX/6C7DSt8AV52G6S9PshJAgXkZaGLJXcWx4u1rntSUCpir5K6n1X OKp6oONfT0DKWwQxrgG/RiNi2AnhLB1Kqmbslmnyb0YnUm94uqe1J4znLFthCEc3YnsZbVdKYtw n/1d62ig+LH/afqcWnpPMQ+R/aX/DHB+JcXybnyf0B7KQ== 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/go.scm (go-build): Monadic procedure returns a gexp instead of a derivation. (go-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I5222463ee5c37f4cd987ac60b1cf2c46eeb79008 --- guix/build-system/go.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 90e63640c1a..f76d969e331 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2024 Christina O'Donnell ;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Sharlatan Hellseher +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -248,12 +249,8 @@ (define builder #:allow-go-reference? #$allow-go-reference? #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (go-cross-build name #:key @@ -295,7 +292,7 @@ (define %build-host-inputs (define %build-target-inputs (append #$(input-tuples->gexp host-inputs) - #+(input-tuples->gexp target-inputs))) + #+(input-tuples->gexp target-inputs))) (define %build-inputs (append %build-host-inputs %build-target-inputs)) @@ -333,14 +330,8 @@ (define %outputs #:allow-go-reference? #$allow-go-reference? #:inputs %build-inputs)))) - (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? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define go-build-system (build-system From patchwork Tue Aug 12 09:04:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43394 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 3CE2827BC4C; Tue, 12 Aug 2025 10:07:06 +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 B364927BC4A for ; Tue, 12 Aug 2025 10:07:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxf-0006u2-Rk; Tue, 12 Aug 2025 05:06:29 -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 1ulkxT-0006om-4s for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:15 -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 1ulkxS-0001JY-Jl for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:14 -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=J1N1oy8V/waDsP+0YrR8VIDHngjwuRzmRZgZR66Sx+Y=; b=aDFo/GeG+5VMLy+TXMH73mPdnH/t9iAh+0j6/6HVeOj/altVouQj7ojzPmQXek6zGULEEuLJ/73xON+xsNV6tJFtavt4LhrAe9fnbIJIG83cTGwXPPqYIlD9oW3CrP51WH8Zk707rqexSwNsGniKRsObX9/GLWeKRQYWlX/XOKe2/AUidUK6ww0gaRzYfEDXiLq0m+SWbzRpvnII9FoJxmhns119zP0ibh7BoI30l6O1Cshrl98PkChI/ed3XXB5ea9i27n4a6048HJHwi+ehw7WmULz1XLo2IGHcO699ob07gTB3sHHoSsmznWqk7QDsXIjmYDcechQmfc4yXVkmw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxS-0007ig-BU for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 20/43] build-system: guile: Redefine guile-build and guile-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:14 +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.175498955929401 (code B ref 79224); Tue, 12 Aug 2025 09:06:14 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:59 +0000 Received: from localhost ([127.0.0.1]:51832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxD-0007e3-0n for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:59 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:37013) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwr-0007bI-R3 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:38 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZm51Hqz20qv; Tue, 12 Aug 2025 09:05:36 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:36 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.13]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZm3gD7z1xpf; Tue, 12 Aug 2025 09:05:36 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 18757B8325D; Tue, 12 Aug 2025 09:05:35 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0064389161d-e6bb-46c5-9f79-396d6ae0a205, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:28 +0200 Message-ID: <20250812090457.19016-20-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: 279223179552350946 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=J1N1oy8V/waDsP+0YrR8VIDHngjwuRzmRZgZR66Sx+Y=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989536; v=1; b=jafqqIPBEcUkn2D8ZtRo7Aj4uihoSDx6zBy1sHTaeU9Je4qnI3+ojVfCbdimap5rKL484IFS OqYOVjYQzoQ25wtbp8+XK/Ncu47A8otQkEOgsCBLtvY8nonII6a7wb/CqivHr38A0t2mdAb+CMx yWIbg49St+tGs7+H1BYN2NGIFmWhD0fxzO64g3m5+28es/tQ9RD5M+CBBEHIPDNALK84iFW18/Z ykjBd9whoFz+vGFpwgZGpX8EmLUYpEPAtCBplT2X2d3djlvJHCL3s5xndYY4rJGLKmlLAchWFrp hLZe0a60NDhJ0Ypdy1cp/pliWQKVW/g7iYnnpWAHb1P+g== 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/guile.scm (guile-build): Monadic procedure returns a gexp instead of a derivation. (guile-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I60f2d7707f064ef6a678e8e47e21309d0eb545ef --- guix/build-system/guile.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 16e37eefd10..f196464feed 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018-2019, 2021-2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,14 +122,8 @@ (define builder #:search-paths '#$(map search-path-specification->sexp search-paths))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (guile-cross-build name #:key @@ -190,14 +185,8 @@ (define %outputs #:make-dynamic-linker-cache? #f ;cross-compiling #:phases #$phases)))) - (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? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define guile-build-system (build-system From patchwork Tue Aug 12 09:04:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43380 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 C826727BC4A; Tue, 12 Aug 2025 10:07:48 +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 9ECBA27BC49 for ; Tue, 12 Aug 2025 10:07:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky2-0007Cs-3e; Tue, 12 Aug 2025 05:06:50 -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 1ulkxU-0006pP-DW for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -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 1ulkxU-0001Ji-3i for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -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=kLxO7Pv+OonHLCMsaeYYCTZ3qkOrJzVo1AkiaeYZJRc=; b=V91KyBVGEj5CsZYNffoqVks6OrBHZlVYY3CB2yqZ9zrp/g4QWAE19rqRjnJQ0u7xnxYOYyiV0FGSVUAmoyrg+KROnThXPro3GC+Iwe+BX4mZUExPfrHkhs7UWzdFlmLJAYXMVLx5fyIb0nmlP+VuxC3uT29B5nF1zvTHHDs4hDd5A6+6I5wYxx6oHPSXi5tKm3pwrzLGKrd1rlMWI50rfc5fVF+wJ5cD47WN7orJhIuc/rqAAzc2Jq7IGPcCCF5WD72czbFFmvZkAuFXz+Vm4nhZScHTajRMGMtwUSmTfYH+uZzDmCEGKIb0q6Mx3J1BXYM7kcT5mxBwl2zjSC7AnQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxS-0007io-RW for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 21/43] build-system: haskell: Redefine haskell-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:14 +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.175498956029409 (code B ref 79224); Tue, 12 Aug 2025 09:06:14 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:00 +0000 Received: from localhost ([127.0.0.1]:51834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxD-0007eF-Km for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:59 -0400 Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146]:38113) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwt-0007bQ-HH for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:40 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZp2r6cz20gM; Tue, 12 Aug 2025 09:05:38 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:38 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.54.219]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZp1p6Xz1xpf; Tue, 12 Aug 2025 09:05:38 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id AB9E0B8325D; Tue, 12 Aug 2025 09:05:37 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-113S00773615582-14d5-4d74-903f-f4922dfb7e5a, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:29 +0200 Message-ID: <20250812090457.19016-21-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: 279786129065829090 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=kLxO7Pv+OonHLCMsaeYYCTZ3qkOrJzVo1AkiaeYZJRc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989538; v=1; b=WTfnj9fk48/4gKlIHsIIdCvlzeRdn2PGd4+pI29vvej8LjYyFD7fE2jRx/idGCoYjJhxBwhL TCL8u+2sifN1bI4ITVtdTfi8PzEWY8MlfPYttKto5QjXu4aE7APun9eDPrNi0nGOhArjbjrFa9Q cWtnN/79awxHq/GDtpeYuC7lnhBKV/pREsGkBb8e7zUIpezAbRQXKWvO4p8Y9hE6zy7BS/HpLth CM7YnnFkJ6vFOUWvwNqdFmFpkDeeYu9k8hWKkehSAUBwSvGhN2ZH1sqFmnJfQIW2vmabRFUhQO6 yYFO9UPvH2Ykn1A1U62gYBC40/J1DBZfhgCtmfUbBG0yg== 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/haskell.scm (haskell-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Iaa4e6af7a69a9bd2710572054b1f304a7701f113 --- guix/build-system/haskell.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index b0019dd0144..f734584cf5b 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,11 +179,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define haskell-build-system (build-system From patchwork Tue Aug 12 09:04:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43379 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 15D1527BC4B; Tue, 12 Aug 2025 10:07:47 +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 C2AFE27BC4A for ; Tue, 12 Aug 2025 10:07:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxq-0006zu-PP; Tue, 12 Aug 2025 05:06:40 -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 1ulkxW-0006s1-6M for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -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 1ulkxV-0001KT-NO for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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=XwKL0hJdzwksxX3ISn20BAZY/sz1waLdx9XI35vqBZM=; b=Z7pQYVw7Wy2yphEU4CFWnbac0qWdppIyCv84jbTcNIsERQLYP9uhZ1J30GMMYzb0ev05iyjVRkzDVhpmVGLEGa0GzM0wT1aQ9IzJcqtqmB5ZUwOLcI7KJHKhq9T9ZU1uhBzBSZvDTcwgi7fHeog2kPfGu4bV6bgEx/UOI2MJ/q7rtxArkihlQIfW0nJl+Mr1u80jB1lawIaRIOUY96vKNUuG7CFNf4Fzzdjf5Fhq/ZBxKUDtX/miH/bjcFVY2N2TSF0OALUZrFNZlfmNWLqV9SKRSmxCugigD7QG8ENYaxtbpttmRSESCWaMaiX4kb8JPTTY5p598OuXOpXnANi5zQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxT-0007iv-DH for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 22/43] build-system: julia: Redefine julia-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:15 +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.175498956029416 (code B ref 79224); Tue, 12 Aug 2025 09:06:15 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:00 +0000 Received: from localhost ([127.0.0.1]:51836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxE-0007eN-1R for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:00 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:54525) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwv-0007ba-7n for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:41 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZr1HQ5z5yVX; Tue, 12 Aug 2025 09:05:40 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:40 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.120]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZr0K7zz1xqh; Tue, 12 Aug 2025 09:05:40 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 6B6B494325E; Tue, 12 Aug 2025 09:05:39 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003afb21f1d-9b0b-47a2-bcaf-54777d8a7b7e, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:30 +0200 Message-ID: <20250812090457.19016-22-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: 280349080305132258 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=XwKL0hJdzwksxX3ISn20BAZY/sz1waLdx9XI35vqBZM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989540; v=1; b=2ksxtdPBipqVFBILCJJ01gb7+OCV8rYcQyF5faOX/DTtgv3PxmlUwp2wo/xo2+GhMa7pIXos MdUNYC7TVghN3hRbLcl26SkSE/oCTITeKpAz/e3gUbUb7wC0S2CC4sFy9KlVAk87l+oDHL1/I24 D7u4Q7tIL/vK5sc4FL7tGqwwrjASbv5U4S5SiqGoZRYBabeD/mMoOCKpnOquZpeYdgIrUJfPVFv reRWkXFGJ6JOU9nB10hCrJ3S+GsbajUzhyDfh6xiDPSL138ouiYehpD6SkWaaHo4Z+nXvDJ8lHX Nlon843Y50qCUxQzte3lk+vHyV4NzSbjBfPHRSoqjY/Lg== 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/julia.scm (julia-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I34303f6cc1423e60f3aa8f66409ca0563e9876cb --- guix/build-system/julia.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index e0987496838..57c403f4d07 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021, 2022 Simon Tournier ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -111,11 +112,8 @@ (define builder #:julia-package-uuid #$julia-package-uuid #:julia-package-dependencies #$julia-package-dependencies)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define julia-build-system (build-system From patchwork Tue Aug 12 09:04:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43377 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 E157027BC4A; Tue, 12 Aug 2025 10:07:42 +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=unavailable 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 83BEA27BC49 for ; Tue, 12 Aug 2025 10:07:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky4-0007Dm-77; Tue, 12 Aug 2025 05:06:52 -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 1ulkxV-0006pk-LN for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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 1ulkxU-0001K5-8F for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -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=8cxoRCA8hwvTifH5BD+t4NQiC6a8qiDsRXJuEKtX/PY=; b=AHQKoP7p/lO03wbG3AYVQgbfCE8G4e1k3iqynyR71qsmQbia3/nDcz1lPIsN26t9xuhhk4Nk/5rdVTuXPrS2iep3ZJ7V461bA6mHcrrtjXOogaq37aR412SIN0aIYrCoohhmdONjJ1GiRpMixFl0aRxGyyAn+Mlj74+BRntTgY8kia1GmG0YgYP+CwtKe/jzzo3GoGfZDhekTEd94G+hBS+NKsJ71zt5Hu62C5GbAM2RyY6BKEgP8Qj/vuN3BgUF0v+uskbHgb44oRTnWVOZaWFpLXokqcb0xIVwOc5/7lWV2CuaeDxbjrsUZqbT7K25C6fRyzCrempRefMCBXdRlQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxU-0007jD-1D for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 23/43] build-system: linux-module: Redefine linux-module-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:15 +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.175498956129426 (code B ref 79224); Tue, 12 Aug 2025 09:06:15 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:01 +0000 Received: from localhost ([127.0.0.1]:51840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxE-0007eU-JN for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:01 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:36583) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwx-0007bi-8J for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:44 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZt1YxWz5yVX; Tue, 12 Aug 2025 09:05:42 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:42 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.252]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZt0fj1z1xqp; Tue, 12 Aug 2025 09:05:42 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7644E783284; Tue, 12 Aug 2025 09:05:41 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003de486f8d-c71f-422e-b598-a7b293b85f94, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:31 +0200 Message-ID: <20250812090457.19016-23-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: 280912027421696738 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=8cxoRCA8hwvTifH5BD+t4NQiC6a8qiDsRXJuEKtX/PY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989542; v=1; b=je4bj+aTp2V0GEUpm+YxPyW5Dx33gECPDmtJli4qyg3t+Wwt7HLIg/cClWnonxAXqNiOiop0 VvyZ/6wfZUUostZnMmUqUIQ3Dg+T7SI3ASMNbQ1wQAlz9eebUlRZZW5EuAMF2SAjLFIV1XRHKa+ RB1b4jJ3uoSP+gGOC3TD/tteFfnDuTLHxum9HQVsj3meyxy/33p+remqAQblmM6eKOdZjUxk/c/ zcEGUsigt5m6goylOnugmLCC0olUpgQE9M/JxJZjoMSkaXod3oynarlsV9iUezmnfCT5Fi6EWeX /6ap316EZ8E+fD9fBA0n5Zp2EUbEvU54kFCISWwrJ7S1w== 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/linux-module.scm (linux-module-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I289c0c77a219445ae0c21f1a9709a67063b38f55 --- guix/build-system/linux-module.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index d8ebef60d0c..a0d213abd58 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,12 +191,8 @@ (define builder #:parallel-build? #$parallel-build? #:inputs #$(input-tuples->gexp inputs)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define* (linux-module-build-cross name @@ -250,12 +247,8 @@ (define %build-target-inputs #:phases #$phases #:tests? #$tests?)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define linux-module-build-system (build-system From patchwork Tue Aug 12 09:04:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43386 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 EDA2327BC49; Tue, 12 Aug 2025 10:07:59 +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=unavailable 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 8E0FF27BC4A for ; Tue, 12 Aug 2025 10:07:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky8-0007HP-5r; Tue, 12 Aug 2025 05:06:56 -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 1ulkxW-0006s7-9X for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -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 1ulkxV-0001KR-Lj for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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=z7rwpLmIkMVk0YbvUdBOuBLGDfotC0SEm6k81UgqEzw=; b=WTlUkzLmQa75kuWPqUC/RhrJoa/GM7Oo6A4b9opYrwMK6htKgM3fGGYbcpGLgQoLflmjmY3q5+Ab3149/OtSy/FpOcSK/vCN4ij7B9140oMbKoPY/t3gjUQyZX7/qFl0gj+pnNvhF+WoG1wEuoWnE627vTNskZwYv+V+mqkBdkILTzkagyzw4/OhovQT0wPep61tzuf6GMPRW4t52tOorQmxOdXIGOXuVqjuI48iSili5GKodt8vukRanhFy9TOYW4FPqDEoYjMINc058QpZmCPC46YG5PnTUlIOxlGropBVuSynG33hGsU/smZSOQnb1FExauKDTKiZKDmHISikWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxU-0007jL-F2 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 24/43] build-system: maven: Redefine maven-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:16 +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.175498956229440 (code B ref 79224); Tue, 12 Aug 2025 09:06:16 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:02 +0000 Received: from localhost ([127.0.0.1]:51842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxF-0007ef-IC for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:01 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:36127) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwz-0007bz-17 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:45 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZw06Xgz1y8c; Tue, 12 Aug 2025 09:05:44 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:43 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.215]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZv67ptz5wZX; Tue, 12 Aug 2025 09:05:43 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 43D408E327B; Tue, 12 Aug 2025 09:05:43 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S00460ca3d55-43b2-401e-ad05-d39cc20afe17, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:32 +0200 Message-ID: <20250812090457.19016-24-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: 281193502052311778 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=z7rwpLmIkMVk0YbvUdBOuBLGDfotC0SEm6k81UgqEzw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989544; v=1; b=RqN9Cw6JEObOeWksQS4jcDH6tdn9OB47D6hrpGjGlHzAnCuyfEZCzyvAmt5LkGKS7Kv0p5B+ oE78iq8tHsZomgh2AYeevozWWog24Hc3lb5Lijl7NhZXr2dDwg21mKdQKGYNhhFfhkiv7BGKnyf lcIvnGC5yztLhDtDBxH7D9p6EfGBhTklFV56XtoIYxywy4qbVOnBJaTO96LuUWs7YUto4eXxteO qpmAqGxhD0f5zAIULNtogUoq+uGPascIQtL2D8SCoeJA3GuhaK1xGnLwovXR0LjtFgBXoHLVc02 ksCCDgaBnyvA4WoWth4e3swNW9Yor+CXTenEwgoiYX7dg== 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/maven.scm (maven-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ieb96bcdb1c654371279bd7295ea69e2dfad71175 --- guix/build-system/maven.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 03e4e96b892..270fceb350a 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2021, 2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -185,11 +186,8 @@ (define builder #: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 - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define maven-build-system (build-system From patchwork Tue Aug 12 09:04:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43372 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 A44B327BC4A; Tue, 12 Aug 2025 10:07:32 +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 3AB5D27BC49 for ; Tue, 12 Aug 2025 10:07:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky9-0007Kl-Ql; Tue, 12 Aug 2025 05:06:58 -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 1ulkxV-0006qX-Gm for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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 1ulkxV-0001KY-7m for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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=Dpm41g22BGpFEgOSb8PGd1vY32ufBnPyhRO/9Go62OM=; b=n9gZe+SGzkRvi5rbU0kFihavUG/ea3Xmxe+8GfmUJQSHxLqiZx24A42tanTlzhAdzOaj+HVKCHOb7QK1OAwz3jpXELiL6TcXuZc7H9nddmI75uWVjesqOaY0BODSUR3ZCxT5hSfIPmqiYvqtlgWXH4tQMG2+HvtS7KgyIoWJV4+KpOL2Ajp8RM4WBT7o0D2vfwdzAuZbg3afXiUbRO/femSkcSWiXW04hT/V/d5aBozLluuBpj4vMz0t4J+b3VwryrWJQw9SOtQIULtWq/DOM7wQtmO7iolG270r+MlB/cXYd13Sn2GC3ebcbKHMyvx88ayOdXi2DTgcgb3Ms5M7tA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxV-0007jZ-1M for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 25/43] build-system: meson: Redefine meson-build and meson-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:16 +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.175498956329459 (code B ref 79224); Tue, 12 Aug 2025 09:06:16 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:03 +0000 Received: from localhost ([127.0.0.1]:51846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxG-0007el-0w for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:03 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:52945) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx1-0007c8-BC for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:48 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZx4mfSz6MjK; Tue, 12 Aug 2025 09:05:45 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:45 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.120]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZx3mt0z1xqG; Tue, 12 Aug 2025 09:05:45 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id EC9928E327B; Tue, 12 Aug 2025 09:05:44 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S0083126dc35-757d-47b3-be0a-9806bf0abe5c, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:33 +0200 Message-ID: <20250812090457.19016-25-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: 281756454193521378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=Dpm41g22BGpFEgOSb8PGd1vY32ufBnPyhRO/9Go62OM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989545; v=1; b=MFilO2lSixGSqnbN9mzhpxWUfCSYjP8iuIKRP8DyO6ZMxwcyVopRvuak5O+RavFT07HhSEnU F+ul1ZgIwcGAyi9Xcovr6y0frnWjEYcQwJW2E0lOFRjWRSLzXgU1ihjkDuQm+VCyzYuVAP2J2WY 5r2pqM3LoPYyHylj217VhxNJj/Gsel7u1GbLxTTdVP6eoE9MuGzCgolDxw6CuqYTY4Bm3ZKhygq 7zbxj4uFwe39XJYQWo/FTg/kxxl8jLmAw67XUYyWbgSKXfT3XWeoMmsyPdvNjribUFafy6uapL/ tebG1bbvwY2J9HKckLABXjE9Gq1+WbaanC8e7D+fI+niw== 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/meson.scm (meson-build): Monadic procedure returns a gexp instead of a derivation. (meson-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Id801e757463080dbeedc05a43bd0b2ae23fae4c7 --- guix/build-system/meson.scm | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 612e148fb64..a8a9ece9ef9 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021-2022, 2024 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -254,16 +255,8 @@ (define build-phases #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (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))) (define* (meson-cross-build name #:key @@ -370,16 +363,8 @@ (define build-phases #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-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 meson-build-system (build-system From patchwork Tue Aug 12 09:04:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43383 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 8F41927BC4A; Tue, 12 Aug 2025 10:07:55 +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 6537827BC49 for ; Tue, 12 Aug 2025 10:07:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxq-0006zw-PF; Tue, 12 Aug 2025 05:06:40 -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 1ulkxW-0006s9-9W for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -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 1ulkxV-0001Kh-NG for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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=EdZb2/YvWhX+z8qiNJAjjiiNtLgbAqNyjprIBXXSBkM=; b=BGPXXPa0ZTLwpNi+v+32gH4+SgWNJG1hVUHP9nvdYgkKo4aTP4mEvwMEuxFiZud5l4tqvOBzqmOWMFe79yES4ylJk90EW11G+jHceMgDgBO4HXniN4b0ZIReKSM6P8SJFieoH9uMfnZ6EB/6ViSr7vz/QTeMOJGnvOUGcUr3+FGd/F7qZ5Lu+O2j2mF5Mr9Ys0v97cq86GuQ0+rfH7UXHpqgrL6cCnN3ScAt9gVejAoV3Hfmc9Nyq4fFACJoBl+Tm1/rXVKplsO4Kzh+hWk0lWqWZ/egL8GrYDkiO1+37XAK6bs3LHUMKrqhucB8/e1LrdQS+vGR0a8g+5TBmSdFLg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxV-0007jh-GB for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 26/43] build-system: minify: Redefine minify-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:17 +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.175498956429476 (code B ref 79224); Tue, 12 Aug 2025 09:06:17 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:04 +0000 Received: from localhost ([127.0.0.1]:51848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxH-0007f5-AR for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:03 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:47513) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx2-0007cB-Ln for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:49 -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 4c1QZz26Vsz6MjN; Tue, 12 Aug 2025 09:05:47 +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:47 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.254.128]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZz0FpYz5wcS; Tue, 12 Aug 2025 09:05:47 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 6B3F09A326C; Tue, 12 Aug 2025 09:05:46 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R005b8e129c2-febd-4a57-aff5-8e9f2e65d2ac, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:34 +0200 Message-ID: <20250812090457.19016-26-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: 282319405237592802 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=EdZb2/YvWhX+z8qiNJAjjiiNtLgbAqNyjprIBXXSBkM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989547; v=1; b=M1wZlpuVpJ8UQ1WUXryaFJhYV5C6MkRuQJaR4cotjbAWhvV5CYP5p2Z4sKFNYq5prm1IvIgY 6yqfmir717TRRUACeJDFRrUMe+QgBg6weHqz9PT74X721VLcCNqhxtZ0JgJG4Q2t2ufpf05i4Aq YdRmSC+bbPjGcvH4Wc3WmMwusFIXxx1UbqEn1KGhmKy3lOdCYcxuW4kAEyIep3phQgGQ4LhjqqH DhqUnYHpnj11gj/Yu1aD+7c/dcmXHA5Y0JPPlo6gJo5QtUEi5hxddPccyuwd25EfaO3g/AM8RTC lPMuTW+mReViT6pBDR8ISLdXdcPkKQtCyLK/yfPo8fL+A== 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/minify.scm (minify-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ib009adcec6791d7145ce0d822745495dad9cf6e5 --- guix/build-system/minify.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index 98c6e75980d..56590f6819d 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2023 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,11 +98,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define minify-build-system (build-system From patchwork Tue Aug 12 09:04:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43370 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 F3F0827BC4A; Tue, 12 Aug 2025 10:07:28 +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=unavailable 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 CF58F27BC49 for ; Tue, 12 Aug 2025 10:07:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyB-0007Ov-BU; Tue, 12 Aug 2025 05:06:59 -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 1ulkxW-0006sZ-RQ for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:19 -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 1ulkxW-0001L3-Aw for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -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=QQdSbEKKDnS8gx6LJUXlPtOa5prhNMEdAS1jwwMKyk0=; b=VTtGPW+Ip8qTCHaT9xdt28MrILaN7ibHDFV6okEPDMKK4uliOQPi9GgC+TloeEi0yq3LkUk5a45DPxghJtXwBRMTFQI30V2nLWdvm431ejfdUA2uh5yJcUB2KpIwg1uTmZDV3+hQ9T0/ARks2p0RgBQ1cAQ1oLmwQVqh/cn63Pttw3xLGWuZ3qoc3Odi1pzAfcQdwks1JGTQn38VsfkVS0ikgOSDbTdMcWfkyH4ChdeUu3fnWt4vOgt9ha1Z3ssib9T2LOkV1yqYuKCnQrmuFMg9VTcxNGWQitRdBwky9COa88p3+3i/xid19/z7OHrey1kjMvI+MmIK0btcTN0b2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxW-0007jv-1t for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 27/43] build-system: mix: Redefine mix-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:18 +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.175498956429505 (code B ref 79224); Tue, 12 Aug 2025 09:06:18 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:04 +0000 Received: from localhost ([127.0.0.1]:51853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxH-0007fN-Pm for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:04 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:42255) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx3-0007cJ-Lm for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:50 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb04c0Wz20q0; Tue, 12 Aug 2025 09:05:48 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:48 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.229]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb03Vmzz5wDR; Tue, 12 Aug 2025 09:05:48 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 022FB8E3280; Tue, 12 Aug 2025 09:05:47 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S005541ae92c-94a9-4c62-933e-14ab04506a8e, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:35 +0200 Message-ID: <20250812090457.19016-27-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: 282600878071603938 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=QQdSbEKKDnS8gx6LJUXlPtOa5prhNMEdAS1jwwMKyk0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989548; v=1; b=Ocxw6PxIwZc8VFGJZoq/9KtRyuQ+uYwILIjNNGsOQoykPGL3PaT04AIT5fgk9PMb7DdrG//M CCnJZfmxOR88UiWGCsUGq7mIwZkSomscdbIgAHoz2vjz7sr1cxNirYM/sC7ddEZIDQAqSMsiYgj 4VXt+nCYH9W/2w63Vltfpor3KZ4mIL4eYShrL/hMQ/IUOsZvohvP6bEImFCS4/SC1gCk2CgbXCN MhkjiccUC7sd1r1t8ywONtHtZ64Qg2x1IiYldR6EX7gB+dL11eZ4lEWGUv0ILfKYPGqcD2TNQvh zGVr3bT7JwAsnvO0gdxiSFEmKvF+C1PyhokKhDZCgnp6g== 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/mix.scm (mix-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8a31c048d1458ece0f906023763b4585502f7710 --- guix/build-system/mix.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/guix/build-system/mix.scm b/guix/build-system/mix.scm index 4a3ba9fb604..6de09f587fb 100644 --- a/guix/build-system/mix.scm +++ b/guix/build-system/mix.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Pierre-Henry Fröhring +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,15 +126,8 @@ (define builder #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system - #:graft? #f))) - (gexp->derivation name - builder - #:system system - #:graft? #f ;consistent with 'gnu-build' - #:target #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (lower name #:key From patchwork Tue Aug 12 09:04:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43374 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 8FF5C27BC4B; Tue, 12 Aug 2025 10:07:35 +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 67BC127BC49 for ; Tue, 12 Aug 2025 10:07:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyB-0007Os-BA; Tue, 12 Aug 2025 05:06:59 -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 1ulkxX-0006sr-7y for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:19 -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 1ulkxW-0001L7-O5 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -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=PefZY+/SVOgoYT1hIeAFZ+DQxGSFkvE/UdYFgjgLdh4=; b=CSQdVQlXGpe8ACXzsmaMmyKIm7jFj3zHp4Fa904/m0Z0ZFtqjBo3SvYG4BIY9VGKlB4aUzJNTheKYGTBA7wmASRqGUAaV1ia68EM8lNO+PNsM9BExeDjMtaYjWdO34IpvmrPaMsCSCtIxOeotwhDjNWfJPhNu9PWjlszBGMMW8bctpWAG01slwkq9jZIqHDFDO5R0AOqBOU5ut5bTOO30uvutuM105hrD6OH5GEqvDgI0sLqlnOexUgp4Ou5HL2ilRp5JcTESS/uzh+PfSGBxADg192G9245fEUQqqrxZcIy8fH88EVqBHv8gjKbtHHuk8ZeO8D1bgVZ/wWvZCEM1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxW-0007k3-GO for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 28/43] build-system: node: Redefine node-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:18 +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.175498956529523 (code B ref 79224); Tue, 12 Aug 2025 09:06:18 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:05 +0000 Received: from localhost ([127.0.0.1]:51857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxI-0007fx-QY for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:05 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:58079) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx6-0007cd-C1 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:53 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb32Pcgz20gM; Tue, 12 Aug 2025 09:05:51 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:51 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.215]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb31VDtz1xrh; Tue, 12 Aug 2025 09:05:51 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 733D4783281; Tue, 12 Aug 2025 09:05:50 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002cd89875d-d98d-47e5-a9fb-f18cda9da108, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:36 +0200 Message-ID: <20250812090457.19016-28-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: 283445303564755682 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=PefZY+/SVOgoYT1hIeAFZ+DQxGSFkvE/UdYFgjgLdh4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989551; v=1; b=k2L6jQNhqHvdI7oJVCurq/IIsghw1I2Hm5z9GQ1Y459B+KsIaRWF4UhmjuySI/+9LVIwNxW5 6S1QKh5Y3oapgS6fnS2sg3I8E0wKSPQEJFr3s2U/xQteR3Ccsc3B4/qTRajf83DV/5jL/O4n6aV pOWLBvNXzgrSiCDcYKtDKyi5USrUP8Xx4VtogZeCJZQntmzmKMLg4rFEb9yB+V/7PAS1JVAXB/G 7XqcCGURx9wLJiXz08Bmxg2e64SV30NyJnBS/GE1lfRtygjqG7G8psZq0/PgvWP83DW0LBwmXaI XL5Wh4P1Qn6g5Gpqy/yq2GAj+crP76kAEHaTC/Ttd2H7Q== 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/node.scm (node-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I507547e474c379c0f66dde15abad73787953e5e6 --- guix/build-system/node.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index cde0ccb60e5..995a46d3029 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2024 Daniel Khodabakhsh +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,11 +121,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define node-build-system (build-system From patchwork Tue Aug 12 09:04:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43392 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 A6C0427BC4A; Tue, 12 Aug 2025 10:08:30 +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 8255C27BC49 for ; Tue, 12 Aug 2025 10:08:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyC-0007Pz-7z; Tue, 12 Aug 2025 05:07:00 -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 1ulkxY-0006tD-9s for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -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 1ulkxX-0001LR-Fv for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:19 -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=u3IkuedycvLH097shRpn30s3VdRyzuhjmeQ3kI3hV5o=; b=abtl5yLyfYnt/7mzOzSjOUm1LaeDiEX9X5heBDHoXuVfmk28i6/4aYYeYahCvDB6m9TuZykyuOhFbmR39m3EbIk2Aw3Va8oyQmrJKGJK7Nlw0GVWT1SVbw6Wmjp41vBBYdV/gbnnlF564rP890dh0dHHbKzKPT92852GGeDovmeEADfSrPsM4yJasbU8c4R8tdF0uDsPV80oZhkucRRYy83i3Tbx9qR6VykreIouJVcjBxX9URzvTi1Gyxmw/taJjcmLaFQO+VlKrsirWWfGawUApwlZ5TCsiSisChn0juBGTJm8i0NQTClzU7Zn7qNGoJqvzstymnsJ6J514CKE2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxX-0007kI-7y for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 29/43] build-system: ocaml: Redefine ocaml-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:19 +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.175498957729730 (code B ref 79224); Tue, 12 Aug 2025 09:06:19 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:17 +0000 Received: from localhost ([127.0.0.1]:51895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxU-0007jJ-6j for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:16 -0400 Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146]:55797) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx7-0007cf-Jx for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:54 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb43Wkfz20lC; Tue, 12 Aug 2025 09:05:52 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:52 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.57]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb42ZXbz1xqG; Tue, 12 Aug 2025 09:05:52 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id EC125783281; Tue, 12 Aug 2025 09:05:51 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R002675133dd-bc63-4c22-b9d5-70ecb5f02b77, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:37 +0200 Message-ID: <20250812090457.19016-29-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: 283726780199330530 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedugeelfeekhedugedvieffleekgeffiefhkeejudelveeuuefhheevtefghedtheenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=u3IkuedycvLH097shRpn30s3VdRyzuhjmeQ3kI3hV5o=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989552; v=1; b=Qpbf7n4vWGfVCfusdsFXiWIRxzLZ0rxdaQz00mVDeOFW3NUeTj0HjYbtzUwU1KoPKo1KhlZ+ C2ZQpgwz/3h/XCVL9Zyi8HY4Hk/WpSrdn+d12mZH+Qe8sKjEiq4TGTGh6IfJCB2vSe+n8ougNV4 nGFRTF5jXvcg8auJ5BIVcTxy20xa/eZROXCm5p2jlAAyhy+c7hgrxoIbnXWElJsLoHwWTbMdFPz xGF3VY6z5ZoSt1WbinCIIulp3l6luzXX8489l63CfPB46UbX0xcqDDHkKwB6K7zJOwhqVwPFGSk EjyeF+YbsVCq8wkCT8IGTvZQR2Z51KzaRuP1kE9fHcHiQ== 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/ocaml.scm (ocaml-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ib525ddc1df03b33b95a433dd2add79405f611f94 --- guix/build-system/ocaml.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 2f2e6dd62e0..cd4c8770486 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2021-2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system ocaml) #:use-module (guix store) + #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix search-paths) @@ -305,11 +307,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define ocaml-build-system (build-system From patchwork Tue Aug 12 09:04:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43390 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 77A2127BC4A; Tue, 12 Aug 2025 10:08:15 +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 B64ED27BC49 for ; Tue, 12 Aug 2025 10:08:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky1-0007Bu-0h; Tue, 12 Aug 2025 05:06:49 -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 1ulkxY-0006tG-Ek for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -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 1ulkxY-0001LZ-44 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:20 -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=w2EN+RrUpuk7PWvybjO/zBSfFsLRVhm0d1Pu6kWYPt0=; b=di2FyCEgpoOXOIdTklI4N4X5o44PXFOq2ylXl94rxuFxqr7k0fylG9m1tTTO/KsxAG7HiwIQgwuALgVXnhgWAHLeugwDlWiGMR5NBmn9bksRVtDVvS5i/9L90G6zgXWrCLt/+Uji/FynJ8RmCahWHscw5sNgw5ANvulrCBdxYfH8c3Ey+i57Mw7SOTWqNcsGZCW8c7C+Wd9ykxFGIE7f5Xxy8eDS0ozNEr5WztR940aZInrt/j06xziDVvEGIS9nHNG/pF3SlKqVwEaJu8GCmYeJd56lLsGA307Q7topdP/aCtwLcWT2UlYvfRQ8YJb8apGetKXCiRUWLMMwbqgCMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxX-0007kX-UB for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 30/43] build-system: perl: Redefine perl-build and perl-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:19 +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.175498957829752 (code B ref 79224); Tue, 12 Aug 2025 09:06:19 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:18 +0000 Received: from localhost ([127.0.0.1]:51898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxV-0007jY-0s for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:17 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:40303) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx9-0007ct-BW for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:55 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb627r2z6MfW; Tue, 12 Aug 2025 09:05:54 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:54 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.249.235]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb61CjHz1xqp; Tue, 12 Aug 2025 09:05:54 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 819ABB8325D; Tue, 12 Aug 2025 09:05:53 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S00482c32f16-28bd-4f55-b6a6-b70816ec4e48, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:38 +0200 Message-ID: <20250812090457.19016-30-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: 284289727419048674 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=w2EN+RrUpuk7PWvybjO/zBSfFsLRVhm0d1Pu6kWYPt0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989554; v=1; b=EnStLzq0R5hhF58jDSWH7N1G9UDo1x39ie35IWAmCOklnWCPJAB24PhHwrGrZbEd83kLyXe7 JSGC3xty2FTu+yh6HCU+DCEDuYF/K6tYAekx+XqKN/12o33jSlQSBFZXNPRRr5RbFnck18xxJat pYaIelgVyFoAXkNkAJGT3UwUpBzhbw/WdaDsALMmMuj7xyruUnDd2+f5P8tuhXygGBozf6avTy0 nLyggq9GxhTy3qzpmp2NRe4RyTdopZTXfSZM50fmYvlwWt1L+Dvt4GE3ELoTi7GdRSKzIs78z3y qJzo5OceXYPIGhE3phx0reQXcjFeZnmLmzIUwmGmYtzWQ== 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/perl.scm (perl-build): Monadic procedure returns a gexp instead of a derivation. (perl-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Id54ae050c2b64269ea42ec9f89d9c3a84ad4429a --- guix/build-system/perl.scm | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 98d48fec7c0..3f088fa6bfa 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2021 Ludovic Courtès ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define* (perl-build name inputs (guix build utils)))) "Build SOURCE using PERL, and with INPUTS. This assumes that SOURCE provides a `Makefile.PL' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -146,14 +147,8 @@ (define build #:parallel-tests? #$parallel-tests? #:outputs %outputs #:inputs %build-inputs))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (perl-cross-build name #:key source @@ -211,13 +206,8 @@ (define builder #:outputs #$(outputs->gexp outputs) #:inputs #$inputs #:native-inputs #+(input-tuples->gexp build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #false - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define perl-build-system (build-system From patchwork Tue Aug 12 09:04:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43389 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 35CBD27BC4A; Tue, 12 Aug 2025 10:08:08 +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=unavailable 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 C98EB27BC49 for ; Tue, 12 Aug 2025 10:08:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxy-00076V-U9; Tue, 12 Aug 2025 05:06:48 -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 1ulkxZ-0006te-2k for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -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 1ulkxY-0001Lr-Md for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:20 -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=CHdj0LxMuppNkLsRmfdCE19SQrBIu9fepUA265+UjIY=; b=tzZv1TU1ZXk/c/BhjAcyuGngxcfZzMdpv/gKYbwMxVgV2t4+fd79LxRkePNgq0aCT2Q+iA/pngr7s3n9XaCfqyKVaC8+Oby9miwmElhLL+0RHvflJVBvjmptxRhapchyLIwrByOuMnITuY8mV6Cg4T7kBA2oOCbVEPvmZQSSqj3Ajf19s1EM0S+t0TCtxvDiWlUYjnIfnLP4tg9VAuyfnEDib1UxOeRPX0i3krB0WUEVUSP+dxhSl7dC9XfK/Lsc0xn03fjd3C7yynEM2ON22q3+b/IP1uxXHW7lEcClYKGXMiy2ySyw/3Q7Z0WLhbIx8pDPob0U+MfErvylc43QNA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxY-0007kj-FP for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 31/43] build-system: pyproject: Redefine pyproject-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:20 +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.175498957829772 (code B ref 79224); Tue, 12 Aug 2025 09:06:20 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:18 +0000 Received: from localhost ([127.0.0.1]:51902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxW-0007ju-0G for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:18 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]:56629) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxB-0007dO-6U for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:57 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb812g4z2121; Tue, 12 Aug 2025 09:05:56 +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:55 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.27]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb76GMbz5xRD; Tue, 12 Aug 2025 09:05:55 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 5981E3E3260; Tue, 12 Aug 2025 09:05:55 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G004fc5c141f-6bda-4fa6-9df8-5d888173cdbb, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:39 +0200 Message-ID: <20250812090457.19016-31-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: 284571203792659170 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=CHdj0LxMuppNkLsRmfdCE19SQrBIu9fepUA265+UjIY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989556; v=1; b=K/nSampunxOCrcAMtoFBqxxv5ka5npWDG//7EE3BE5acGIZNbOgQd2sHHCRJgOL8Zg5mC8Xk 6lm9chQf8YqpCg994o5FMi3cB4scFSxvLIYm7whgeozOCsLe2f8x/pJqb4AWv4t+iX9Bi6dt/ig p7t0VLOvurVyNZVKKHNbu9YoblP+kmVMUQ87l3oOjoZC/DYOO6p3JYPWZ4hdjOgDCUHs33toCPY lEaV8WaKWE7bKSRtco6iIN+GfFd/y/C4kyl3BxAB0rpkLzytWOGe6JWr1S9zN2DNolwZxC4Tblk vd+k+eF4gCNezJt2e/7pjgnc4/aEWPs9At+9cuzYBBlHg== 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/pyproject.scm (pyproject-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ia26001291b472c69c65647d8bddd1199f0ddc483 --- guix/build-system/pyproject.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index 4ad4dc79a1e..b39f27a2f0a 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2022 Marius Bakke +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,7 +114,7 @@ (define* (pyproject-build name inputs allowed-references disallowed-references) "Build SOURCE using PYTHON, and with INPUTS." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -138,16 +139,8 @@ (define build search-paths)) #:inputs %build-inputs))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:graft? #f ;consistent with 'gnu-build' - #:target #f - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + (mbegin %store-monad + (return builder))) (define pyproject-build-system (build-system From patchwork Tue Aug 12 09:04:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43378 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 C58B427BC4B; Tue, 12 Aug 2025 10:07:46 +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 5F6B927BC49 for ; Tue, 12 Aug 2025 10:07:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky9-0007Kk-1A; Tue, 12 Aug 2025 05:06:57 -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 1ulkxZ-0006tf-D4 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -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 1ulkxZ-0001M1-4f for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -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=qYlkmymbipDbxAcRQbUQSoluxxcO3X8AXun8bkgDlI0=; b=pTwraKqxspmsegOb/azpTm3hfyp5EzhM/g+TWJqDFAVbszwAttNTy12aWMklRuJ4t/SNGuXUDHtRTaxFSoBh+dXBX0Lc9o84DW0ThNi9ynDE2ChbCRws6vCy17b2f9s+zA1ao5YzX8v/hZjhykmmJopszYLhOOyJy8XH2wYBIiXKplCHmerN/5k0J7IRDbFBxwKOg5ZKtoKuOGi0v+T6psImq7tb0bXPLgZzIhExv+KbPRIoo8LOxoqTgVKByd9h2j0rAgZWu2f/s1/8jPzxO1etAQgGdVS9MoiEBBtSaBIhlJvNzLyRrJrFN6q7VR/pze1YCnXQw29e2ojVUPt6ow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxY-0007kr-UD for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 32/43] build-system: python: Redefine python-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:20 +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.175498957929788 (code B ref 79224); Tue, 12 Aug 2025 09:06:20 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:19 +0000 Received: from localhost ([127.0.0.1]:51906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxW-0007kF-SI for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:19 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:53379) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxC-0007ds-P9 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:59 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb958cSz20sq; Tue, 12 Aug 2025 09:05:57 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:57 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.139]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb9454Hz1xwy; Tue, 12 Aug 2025 09:05:57 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id B1F329A326C; Tue, 12 Aug 2025 09:05:56 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G0025508b5b5-d3c0-48a9-b3f9-99a987fe3f5b, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:40 +0200 Message-ID: <20250812090457.19016-32-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: 285134151658562274 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=qYlkmymbipDbxAcRQbUQSoluxxcO3X8AXun8bkgDlI0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989557; v=1; b=up1vzGN/ty3Q5KWsFx8UyQjUXbr11R+OM3tiLC7/Bn1TqsJrA9erGhITiscZa5OB4dAtheqV 947o1+Qgs4amu+/TRTIyTJ+m2juTO2QUAl+TtKswK3KWb0fdyG2aexvXA+1ATSn9DpEpNZuVwjL WrYke4XKj5V5QPYHIX8eMTPVjDgj3d6ilAyyL9CscuFdsqYpK1gBKnKl1qWAgRrYZ8SrkUszDNg Tsq+Dj26fzTjcGr0dR8scq9/bhjjnHhFvdhDQR2bHYoq+WHIUa0uHmj3Dzq3Q20ikviquGpf310 CZkrxyB33diCJ5H+Xk7f+xTACAzKZ2o4A8i+hyHqsEwhQ== 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/python.scm (python-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I1d270fa64192394072279f73ae0d77877d41f01c --- guix/build-system/python.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index a51c033d01e..3c37ca11f12 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2021 Lars-Dominik Braun +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -184,7 +185,7 @@ (define* (python-build name inputs disallowed-references) "Build SOURCE using PYTHON, and with INPUTS. This assumes that SOURCE provides a 'setup.py' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -206,15 +207,9 @@ (define build search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:graft? #f ;consistent with 'gnu-build' - #:target #f - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + + (mbegin %store-monad + (return builder))) (define python-build-system (build-system From patchwork Tue Aug 12 09:04:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43366 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 07E9127BC4A; Tue, 12 Aug 2025 10:07:17 +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 8EC2727BC49 for ; Tue, 12 Aug 2025 10:07:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky9-0007MO-C0; Tue, 12 Aug 2025 05:06:57 -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 1ulkxb-0006tm-0q for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:24 -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 1ulkxZ-0001M9-JR for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -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=qYxlOVyau79CDg3mjfqR/0ZztbTmOOfCKN9/AEKHqQ8=; b=EgQtnoSdCfiexLYGPn29l9KqEEF6KTIRWday+B/wP06j5RSDt5YHQpQXIq8QbNBTi8cLTMWjgMt9ofN1BncG+m3IeKSzNaWemiq5wkUycflCNbOQw/baaOCaGnMg4IhV0yY54ffvdPeGw4ibSCqrShiwrjFBuSO3TNPRXdOxmnpZnJ0+PcdsgncFqZkdMebkfSoWk0jKCeG0FLVKiHoTl97KFZGTqmgtY3cgTkYiN/w7s1a8NNYLA0IyWAaQqWQW6edIoQ05TLnoTF8ud7UgD0IHqJU16AiLy86t1cDEt/9f1EfJOyQvl7c/X9V7YgtIdFJGWVbdfdI11WtYwufUOw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxZ-0007l1-DQ for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 33/43] build-system: qt: Redefine qt-build and qt-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:21 +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.175498958029803 (code B ref 79224); Tue, 12 Aug 2025 09:06:21 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:20 +0000 Received: from localhost ([127.0.0.1]:51909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxX-0007kQ-Ia for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:20 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:34257) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxE-0007e9-B1 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:01 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbC1g4Tz5xKX; Tue, 12 Aug 2025 09:05:59 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:59 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.213]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbC0kcmz1xpf; Tue, 12 Aug 2025 09:05:59 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id A37C73E3260; Tue, 12 Aug 2025 09:05:58 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G005c56a1a18-0cf4-4554-ba56-43be49831a1b, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:41 +0200 Message-ID: <20250812090457.19016-33-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: 285697102950097634 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=qYxlOVyau79CDg3mjfqR/0ZztbTmOOfCKN9/AEKHqQ8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989559; v=1; b=Jm8N4I/Zuf53CMNKqZEztD18/arcMvDwwHHm79JdGGd/3N1fyXbHv1mM788nRPHYhduiKyHg RT5bbOoCyzYyp27yxXIsQWXHnG6odNoGN65OimCBErfeUi3pjOw25umUQfU8YxiLYz2VnAv4mBI OVzn1vnGAk26Q44NbGA//fYgYYU5UEdoGR9M98wB/vMHmTr9QRbmIkq/Q9QKZJJ2AjTbo22yhf0 InKb4ClF8p32N+Cd9ldeWISOD2124yXxM0DcwsrJiDXSugEHREjA95v0JrTlKWO9v2ZD0RALggN wmzdVsUcxbJ0MipBbhwV4CohUxYSkfk2iOgeEjyVm7Dgg== 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/qt.scm (qt-build): Monadic procedure returns a gexp instead of a derivation. (qt-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I194a9d1a7c7600af2e991e1efad627a9ced235d1 --- guix/build-system/qt.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index 84e008bfe79..09ddc1db3b8 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -180,14 +181,8 @@ (define builder #: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 - #:graft? #f ;consistent with 'gnu-build' - #:system system - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + (mbegin %store-monad + (return builder))) ;;; @@ -277,14 +272,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 - #:graft? #f ;consistent with 'gnu-build' - #:system system - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + (mbegin %store-monad + (return builder))) (define qt-build-system (build-system From patchwork Tue Aug 12 09:04:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43375 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 4BF3827BC4A; Tue, 12 Aug 2025 10:07:40 +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 1D3FD27BC49 for ; Tue, 12 Aug 2025 10:07:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyG-0007Ui-EG; Tue, 12 Aug 2025 05:07:04 -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 1ulkyE-0007Sa-LI for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -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 1ulkyE-0001Tw-Cv for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -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=G1Fo37HwS2t1bGsEZJiHKQMw+EYK7h/GnTFzKmZtNW8=; b=BvFbKh/sbK/cFeT3sW2LnW2VsrE4Hl4legiNO4DitAnGr7IGRNeyJe1t/LQl5EkLmF2kQNTR1tm8WngqBoFzUwIZ7nVP3VIDLPOQqX5TX3t8YtuLOQ23wqoYt5YQCbxqd7y7Q3Y63/M+IkozQ1FSTIths8czGe03FrVhYxAT68UQT/a+i5wYCeo9bUTFlWUlXa9IRxpu3DAmYC4uUmujWQyCYjtw5tC0gL4+/9wGWx3D9lL6/MgzOtbDZwOkiK4v7vijHirj1j54SdE6oL0A6GVXX2+VT94KHWRfyadevnstqgFYIp+QZ/kjw94ZrRrwBApmRzocBPIxSfgvywR2qA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyE-0007nR-65 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 34/43] build-system: r: Redefine r-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:02 +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.175498958229845 (code B ref 79224); Tue, 12 Aug 2025 09:07:02 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:22 +0000 Received: from localhost ([127.0.0.1]:51915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxZ-0007l8-Qq for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:22 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:39175) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxF-0007eX-Qq for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:02 -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 4c1QbD4T4yz6MhB; Tue, 12 Aug 2025 09:06:00 +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:06:00 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.139]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbD2YtNz5xRD; Tue, 12 Aug 2025 09:06:00 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D3D8AB8325D; Tue, 12 Aug 2025 09:05:59 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G002b4386ad4-34b0-4e2e-9f5a-dc44691c0080, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:42 +0200 Message-ID: <20250812090457.19016-34-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: 285978579770139362 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=G1Fo37HwS2t1bGsEZJiHKQMw+EYK7h/GnTFzKmZtNW8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989560; v=1; b=SLgq2CfViSZs6LROWblmnmHS8/W8ANbdkVg5t60IwNdy7rXhpI2ihYfmYjkh9xoL7aYCZWrP snLkQiMCmKNtWUEMIRXS5ZeNL8PkK7IliC6DBbu09KVLczkYC3/Xh8RA+l5rf7agPoqJffuFfXi Mrqb+NvBaL40tbxIzxPtwpTmfFZuUEuycwPZVcrmxG3r1MAHztM/hd5Phs3hdD7XnQ0ImH6NrYR AtFM2m9Bqi3zUZBYuQSX4MUHrZaMNokxiwJAO+TkleiCFH6uDR/2Q0f0+EcVDlgOnf8E+190vSO lY31nc1UK0qPCuuDsz6gzy3BugE6n7NdhvhfIjoruOS/Q== 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/r.scm (r-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8f5a76eac6b65beba95852b7bf1645cd8a7b255a --- guix/build-system/r.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 4b4b3bf0c9a..9077080deec 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015-2024 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,12 +138,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define r-build-system (build-system From patchwork Tue Aug 12 09:04:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43385 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 E615927BC4B; Tue, 12 Aug 2025 10:07:57 +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=unavailable 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 BA43527BC49 for ; Tue, 12 Aug 2025 10:07:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyI-0007XP-SQ; Tue, 12 Aug 2025 05:07:07 -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 1ulkyF-0007Sp-4j for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:03 -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 1ulkyE-0001U7-Rp for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -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=QtN3y15L7s+D/o91k7vY1HOVZpieUgk7uoYUJX9Hmgw=; b=tdrIMEMNBzhC6XZXPpbxK6+wuTYvqA0ovgkH4oEO8QsKrU9XXbbzZvHmIJE9NQXKlIL9J4fvMmrfaiKmetSmU8RN77SpleaMI5IQxz6K99m3zYH9ePtov4jEuBA37jXv/UBMru9PXPoKnz1AE5cPunsCLefvUeICseQP9GhdvgJNA4ELwmMxJfxngpxjgjW7/235ajSAfI6Oa3HRWDOZ7OvGgmsv1vyt9q2TvWxtPAREciIeghJKgt+nKP7Q/Iyz4UEzQH181mafvosHOBKP5EnG9KT94rvbyiPz9Dcto+rLsLx2KUUteAQUvDtiexBhCfoGvrMbYTcUbZ7611mZZw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyE-0007nY-Ko for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 35/43] build-system: rakudo: Redefine rakudo-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:02 +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.175498958329853 (code B ref 79224); Tue, 12 Aug 2025 09:07:02 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:23 +0000 Received: from localhost ([127.0.0.1]:51917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxa-0007lP-C9 for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:22 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]:58965) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxH-0007f0-Iw for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:04 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbG2vqqz20q0; Tue, 12 Aug 2025 09:06:02 +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:06:02 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.54.221]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbG0sC9z5xRD; Tue, 12 Aug 2025 09:06:02 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 76B089A326C; Tue, 12 Aug 2025 09:06:01 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003b334f23b-4f66-4c01-a5af-19af80416eee, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:43 +0200 Message-ID: <20250812090457.19016-35-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: 286541530395697890 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=QtN3y15L7s+D/o91k7vY1HOVZpieUgk7uoYUJX9Hmgw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989562; v=1; b=eX2FbGsO5Jc2PFRluMMyWQxCRPGFrkvsnkRpp+N2z7dryHEDVswMIqdM1wQBQhwdHoc5bVIg iBuyVi9HWjSGiHcfPuJM5DG2z3pDOitCeOxYOfl19q4e0zrchNseXxjI0mBu3CsEwCmnXvM+Lkw 5qxefp6O1Uam4K1C8Cp6D5kdNOGjq6/7SEcTFrxHOElCMvWo927Lbt1mLjwoFk7ciLOTPlkb4wh 4mekmNwRICywUhWSm0GBG+8VYiFtWfgZ0ObDY8JpQz2Qvyd+F9JCzmtDy1WubO2Sj3m3xVvM90h 35xFhLPvOyNzL+43F677WzNwSm654fTsMtcPV+3H9Lxzg== 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/rakudo.scm (rakudo-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I5f484023b8eb9806ed366e5fc596b844a61f524e --- guix/build-system/rakudo.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/rakudo.scm b/guix/build-system/rakudo.scm index ee13c507913..6d4e9b9f6ee 100644 --- a/guix/build-system/rakudo.scm +++ b/guix/build-system/rakudo.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,11 +128,8 @@ (define builder #:outputs #$(outputs->gexp outputs) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define rakudo-build-system (build-system From patchwork Tue Aug 12 09:04:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43395 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 0A2CF27BC4A; Tue, 12 Aug 2025 10:07:52 +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 9E7B027BC49 for ; Tue, 12 Aug 2025 10:07:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyK-0007aC-94; Tue, 12 Aug 2025 05:07:08 -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 1ulkyG-0007VH-KY for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:04 -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 1ulkyG-0001Uq-9s for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:04 -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=WqA177tHfVsFRO5/ijMhw2bSc2iZB6JKMBFM0yGqDtQ=; b=EwRwOpPHdJVGkNWXBnULqn12hU5B/O7NWuEHtEH2k7duklHeAdWWpEXfCeFmxj3V++sHEaJOupLJcFczRLokH3y3ORO6bd8QrkUxZXDCe50VLs5sMChXAJI4tlCCh9JIRftqlnZOlI//KH3JXKLs8Vop48oRXA+GoPLDRcYLWIWmOIC/Mkj6NGDkp1B9qha7YOe9QqMHZJuMtbZtdrGoEf730tIifubwpskVmZSRqp843mO/DfP84EIYTogyUzwEGKalv6Z9pi2b4BWee5hZbAOi8ZbEq+Sb3yQQqr5XOBbdPNLz0D91CvZxUqc2X9ikHwSM/8sz47dYr7EjYGck+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyG-0007nz-1x for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 36/43] build-system: rebar: Redefine rebar-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:04 +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.175498959029887 (code B ref 79224); Tue, 12 Aug 2025 09:07:04 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:30 +0000 Received: from localhost ([127.0.0.1]:51923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxi-0007lx-2w for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:30 -0400 Received: from 2.mo562.mail-out.ovh.net ([178.33.252.217]:45829) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxJ-0007fS-Hz for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:06 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbH4hjxz211G; Tue, 12 Aug 2025 09:06:03 +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:06:03 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.229]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbH2r7fz5wGk; Tue, 12 Aug 2025 09:06:03 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E059F3E3260; Tue, 12 Aug 2025 09:06:02 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0064ed44659-5312-4c70-a958-9b3592349952, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:44 +0200 Message-ID: <20250812090457.19016-36-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: 286823005069173474 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=WqA177tHfVsFRO5/ijMhw2bSc2iZB6JKMBFM0yGqDtQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989563; v=1; b=pLwdWy7mnLYnfTdJDDFAWGbSVBRzNK/Cqb4OvLrXMLjkB26+zMrxtEmZt3z286sFHGI7/IZW V+IyV8ws/1JO2HfDqRcgC+tVB11KmaC1cFxECq9SPaJ2L4J/todqFtfgxH3sDKjDDsECXwivkAk 5YadYMPpYlUvZ6g91dXgSfnOi1AvDL0sS5NwnJA3AvRg+aINpztCwr/UVJ3vNxF9QNCm3TzchhG 2RGdvfN4ACBMoqFPV0XZR4O4HSdLuSXwKf7W2H8UTCPY3yDGgdYSxPjm0c3Cz11FIQOPPaoO1NV jnP98TXhCFPhNU+jCxjLrsy6lfKTWDVXN4+wYjO/QW0EQ== 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/rebar.scm (rebar-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I7d4a29cfc1bedaa762e25deed41cc0eb802abb9f --- guix/build-system/rebar.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/guix/build-system/rebar.scm b/guix/build-system/rebar.scm index 7c7cc5870f8..4766eda9de4 100644 --- a/guix/build-system/rebar.scm +++ b/guix/build-system/rebar.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2020 Hartmut Goebel +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,15 +140,8 @@ (define builder search-paths)) #:inputs %build-inputs))))) - (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 - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define rebar-build-system (build-system From patchwork Tue Aug 12 09:04:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43381 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 4B7C327BC4B; Tue, 12 Aug 2025 10:07:50 +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 07B6327BC49 for ; Tue, 12 Aug 2025 10:07:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyG-0007Ve-Vw; Tue, 12 Aug 2025 05:07:05 -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 1ulkyF-0007Th-Kj for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:03 -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 1ulkyF-0001UD-BB for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:03 -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=4PxvWv0wn7ALErPwUkr7dR1jzmzf9C4e9Q0DrKGkOLk=; b=KN2w3yK0D6oh6UvKh8AMksV37Yq3HUslfzIZpBm4iZeqYsnwu3V+iDtGGCn4a8HFALD8kyi7SO5hstheoRLJNC8cgOY/S52NPEVWRMpzbXFQvN7w7Z4M0jqt66AM7UonHsxGGyxbpDrp259K+CCbPahqUY5pkd9df09d6QntcwuRt++K0HxlAqLSQcBlZ4rQ9/KAfk24+5gxAf1NZpUeM5fgf4gICZOf0HB839fiEvQoRauA6gYU5SSczAs7EEKdJz/uGRULgo2jvMQgul4rYcjk8W6GsWb2ob/UvyeN7w1TCjXmVAJNUG3NkT5/q/vanJ2HSMmQYnDN1noBmCDjAQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyF-0007ni-3C for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 37/43] build-system: renpy: Redefine renpy-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07: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.175498958329862 (code B ref 79224); Tue, 12 Aug 2025 09:07:03 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:23 +0000 Received: from localhost ([127.0.0.1]:51919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxa-0007lT-Rn for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:23 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:33553) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxK-0007g8-3h for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:07 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbK03SRz212x; Tue, 12 Aug 2025 09:06:05 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:04 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.184]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbJ5w1nz1xww; Tue, 12 Aug 2025 09:06:04 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 52361B8326B; Tue, 12 Aug 2025 09:06:04 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S008ac73bb54-4342-41a8-8d3c-6c6825ad2b1f, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:45 +0200 Message-ID: <20250812090457.19016-37-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: 287104478347191010 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=4PxvWv0wn7ALErPwUkr7dR1jzmzf9C4e9Q0DrKGkOLk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989565; v=1; b=NhdwS1+bzCtKrqjLEQpKKrI2MxeZdn5ttfarXMx3dOAQ7exzniNkJmhEny+RzYfOZss/1ZOK NsYt+P+PUNMQuR5YVHaeCB0BKQl5FMIGpH1AYCoXXn8jz8irGFuAyVLjWgFkIO3SoXgZ/UhUTRT PRVvRLUTt02ge9lIenRbbJWrYJKV65Z10DbOW+8MFC8rR+E3o/5Rg434iGs6KipppnJr62knRe2 CMWD2hi4T2mEELPyoPAseoFHGgjm/eUKJqA2uMI4WWQt1W9AHjIHbAKi9tC4DP1N1Dl706NPPnn uYLaNz5xGwcOna8Z/15FCEzAm6P6qnxdlDEeMCUIF6Vmw== 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/renpy.scm (renpy-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I20bf5af43fc9fc41fb2f36637e67d35136bf1606 --- guix/build-system/renpy.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 015dd7c2104..f364da12084 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Leo Prikler ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Liliana Marie Prikler +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,11 +105,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define renpy-build-system (build-system From patchwork Tue Aug 12 09:04:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43384 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 2634027BC4B; Tue, 12 Aug 2025 10:07:57 +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 DF6DF27BC49 for ; Tue, 12 Aug 2025 10:07:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyI-0007XO-Hs; Tue, 12 Aug 2025 05:07:06 -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 1ulkyG-0007Ud-1i for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:04 -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 1ulkyF-0001UN-Oz for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:03 -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=4ZyyAwfRFDG2UcOY8CAgyYuu3E0+ksZG9maDoa4zvfw=; b=FD7Chr97qB9S2z0MFRO1x8BQZ1NWYqrgl9AV5hLaPhbO7fDt3rRZPZepdPcjInnOZf1XCSLjsR9XOxBjMyAsxIrT5+fmUMR4g5vvosgtAuZ/59GRiqagoZA9SiM8kh7EzEmiLuq9EkURDwQt9JlZtz3/FgdVblmd/mbl7bOsnOv6CF0cQ/R7SmacD2BDOBFnhMTHiRzZ0B7X1zI5IcHI0Kphkml+gr4WbHiGshRQ5sJpDtQBETroNsSz+ZCmERK/afK7v2kCqgcC3c5Gw4EkHZaM2CZnR/bTagTg7yWaB0/29N4cKevx1iWCDk6sePpC4G93RcE1JHpyh13/MTdFbQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyF-0007nr-IT for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 38/43] build-system: ruby: Redefine ruby-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07: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.175498958329868 (code B ref 79224); Tue, 12 Aug 2025 09:07:03 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:23 +0000 Received: from localhost ([127.0.0.1]:51921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxb-0007lb-CP for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:23 -0400 Received: from 10.mo563.mail-out.ovh.net ([46.105.78.6]:36895) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxM-0007gW-9Z for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:09 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbL2GSSz5wwm; Tue, 12 Aug 2025 09:06:06 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:06 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.94]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbL1Ghrz1xwL; Tue, 12 Aug 2025 09:06:06 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id B3E248E327F; Tue, 12 Aug 2025 09:06:05 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003fd9cb88c-10e1-4e28-98ea-e2d8f21c61ee, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:46 +0200 Message-ID: <20250812090457.19016-38-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: 287667430298215138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddugeeirdduieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=4ZyyAwfRFDG2UcOY8CAgyYuu3E0+ksZG9maDoa4zvfw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989566; v=1; b=qIfz3vkq26sQxIxbcJtCQCHHTXRNkluJUMfBEC0PzDiV3NFKctStwURisZubd2DWIuFQ9ZFL V1GwI07+it5NQ/E6ayG8ebMRiTNDAMnXKILwEf7vDl0rfJz+sezYKutqfjD+lFm31xe5qaD+F+Q 4SsJrEYlTU/tZiIizB3pG3jJbpo711xuLHeITNCGrB2p6Kg1Mg4ARTilnXJbzcZm4WoyyesOtGn EeXB+UkY/atNOuaSQQv0OJfp+FGAEbYhL0CiCm5yMLjoEs4NjG7TQd0trJOnfhne7YmM3SXqL+6 /hIj0gz4KUEZb0rENUVvRp1bhSsE1dXeZKIN1sgv+29Dw== 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/ruby.scm (ruby-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8de0e2b382271e9ea09d2be9b6169ccfc792230b --- guix/build-system/ruby.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index f258ade6e75..e1c0ecef4fa 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -88,7 +88,7 @@ (define* (ruby-build name inputs (modules '((guix build ruby-build-system) (guix build utils)))) "Build SOURCE using RUBY and INPUTS." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -109,13 +109,8 @@ (define build search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define ruby-build-system (build-system From patchwork Tue Aug 12 09:04:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43376 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 918FC27BC4A; Tue, 12 Aug 2025 10:07:41 +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 5CD7C27BC49 for ; Tue, 12 Aug 2025 10:07:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyL-0007bt-9d; Tue, 12 Aug 2025 05:07:09 -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 1ulkyI-0007XJ-4A for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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 1ulkyH-0001V8-QV for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:05 -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=/MlEAGtvE09E0JLIklcoluk9RsYiF/7nROqFtsbeFuU=; b=jVSr9nxWhoWdJkPBMNc7spyE0NjpKFyVPOqC8FucvNEU+gkFEz0K9JR52/52p7b8S/hr5YN/M98dwfid7OCysDgAtIvJH8oW9NdKb00IlF5F+5FEQOtXDvET8+eOCkZQ0oCNbOKRUsODOiBUfWMz0sJxT1a3WIlbPCg0nK3CtXVyCCpiG26lMUJyMYFuX/xow9d3x7IC4u0k1Mawcgb7gtQKYoG4TN+du41IzOEGj/jN82/OBcIjeDdnKu+H8W82oOpSoQnTi1pDZieWZHAiHGsbuBwCci+a78FNJzbnJTXDguSXQ5+yzPPMNALP6dIzxoeyjNQLmdkVLiUMsUBk2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyG-0007o8-Jn for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 39/43] build-system: scons: Redefine scons-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:04 +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.175498959129895 (code B ref 79224); Tue, 12 Aug 2025 09:07:04 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:31 +0000 Received: from localhost ([127.0.0.1]:51925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxj-0007m7-7e for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:31 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:42715) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxN-0007h3-7M for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:09 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbN1FLnz6MkC; Tue, 12 Aug 2025 09:06:08 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:08 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.39]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbM6ycmz1xrP; Tue, 12 Aug 2025 09:06:07 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 530D33E3260; Tue, 12 Aug 2025 09:06:07 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-113S0072d93a8a1-0a9b-4dc4-9a5e-61ebbdc01edc, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:47 +0200 Message-ID: <20250812090457.19016-39-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: 287948901405024994 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedugeelfeekhedugedvieffleekgeffiefhkeejudelveeuuefhheevtefghedtheenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=/MlEAGtvE09E0JLIklcoluk9RsYiF/7nROqFtsbeFuU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989568; v=1; b=0Vd13mbmpB6NFTZXZyNxuoJP7zipgjSigkXMOh5vRVcrzqnkrLFOFwPNcW1dpH/2UGfOV/WO jvIkDhrYJ6gRghmHFP9HuCav1U1XJxUmPjkojFdSwmHz7iFKvcEeGtQbKg9lQTg+Cce0rFk5i9K aEVJH/xUlR1kG0xmL/4lKxR4pSxTiiTjQ5TpxhgOVSIB9p9slGRZiurZCn+PUWwViZiRlRpDS+k c9k1tibhEYCQ3fck+wTQH68yYp5yF5YiN48JndGrJAXTWaTq01qxQh4/X3uDFLebitRn9D8C6G8 lf8Eo7DFWOyxvwOBROksU+LGdkjjYlXKcQASwli6SaYLA== 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/scons.scm (scons-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ic8c99d06ac53b2ba80a02a191d18de92e9c74e6b --- guix/build-system/scons.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index e76c419b1e4..1b0dde0f489 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system scons) + #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix monads) @@ -117,11 +119,8 @@ (define builder (map search-path-specification->sexp search-paths))))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define scons-build-system (build-system From patchwork Tue Aug 12 09:04:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43391 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 64E8127BC4A; Tue, 12 Aug 2025 10:08:30 +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 319FF27BC49 for ; Tue, 12 Aug 2025 10:08:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyO-0007g8-AG; Tue, 12 Aug 2025 05:07:12 -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 1ulkyI-0007Y5-Hp for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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 1ulkyI-0001VJ-8s for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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=Aoef1QTmDWPq2JYBd7y1dLXVErLbtwTECEAKFDO9Kxk=; b=GnZeTMhqtjOkhuss7S/SdTylkAhk5F/lAmBpfvvajhRMG3ZC+XfoU0yoMPHjXGdsvt3009jo+VEXRoT1obKQd+/1nR+pyAdjf4QbzIx+KWN3lSu+bY4y5ILTu6BJoRXYXe8VOtc9aSEF/PM6xbAMUDlr/wIoWCY5CkmmvVgHVJRGJnGM6IAIsAdDZ3SWu7AyHbZDEOw9sAz7HGZmSb5t7uZZ/IsnIbBAms6XGrDdlF2zcbO7uy5yoQfQuHS7IYtzbYfYX1dQ+MRTkuOOju60JOqvQqLisQKKJoEpMaf2emx0TfXS4GuIHVlL9yy/ECuJbL3haAbhoAbO2XXfEManQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyH-0007oF-1y for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 40/43] build-system: texlive: Redefine texlive-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:05 +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.175498959229904 (code B ref 79224); Tue, 12 Aug 2025 09:07:05 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:32 +0000 Received: from localhost ([127.0.0.1]:51927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxj-0007mD-Qf for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:32 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:45691) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxO-0007hb-Qs for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:11 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbP5nrHz5y85; Tue, 12 Aug 2025 09:06:09 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:09 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.80]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbP4SR3z1xrP; Tue, 12 Aug 2025 09:06:09 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 26C418E327B; Tue, 12 Aug 2025 09:06:09 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003421abbb7-2e3c-48c3-b191-46f9a5848fec, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:48 +0200 Message-ID: <20250812090457.19016-40-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: 288511851375944418 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Aoef1QTmDWPq2JYBd7y1dLXVErLbtwTECEAKFDO9Kxk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989569; v=1; b=xTcnTtmWEs89nvZDxGmEnuFQvP5wwFuzgN/NMPwptek/rMYO+UgIUiKeU/+qEw3QV5PzBAbS QTVa0Ge1es7reL861WUUBo5rDRh01KYA2DvDUv9twUzF0OLeItUm9RFBpMKlKgiEcEGm90Lb85x fjJHggcdIhvoz/qje7UMjs282+l0Rc1qdYj0lJUYqdJiOsvhKRj+c2ruQL+fMutbdt5FjZ4Mz5E Rw2KP6gpcrpJh8ccwZr9stQHRBF3Ck3umZ95zg8GrL+40T/kk9/EU751FP+qHeYMGTN5ifBrvYt LidxuRavREmzDLTPT7a68nFQQ4stoO4hnEHvawKrPsvfQ== 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/texlive.scm (texlive-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I00cc4e5647eec7e5cd7103ccd9ca0beb21361b3a --- guix/build-system/texlive.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index 35587b50fc0..b5b687e4e46 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2021-2022 Ludovic Courtès ;;; Copyright © 2021 Thiago Jung Bauermann +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -151,14 +152,8 @@ (define builder (map search-path-specification->sexp search-paths))))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define texlive-build-system (build-system From patchwork Tue Aug 12 09:04:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43387 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 6145C27BC4A; Tue, 12 Aug 2025 10:08:03 +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=unavailable 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 04B3227BC49 for ; Tue, 12 Aug 2025 10:08:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyN-0007ex-Jg; Tue, 12 Aug 2025 05:07:11 -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 1ulkyI-0007XI-3O for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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 1ulkyH-0001VQ-R7 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:05 -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=ITZ5+ITfBAJ7cGW2IhtGiN8YM9IzU3clsHUtb1Sy5Fw=; b=pK1Xw0dNthcXcRYFsZST5N0xkMF2YHxKli3zjcuMo3MTEP+7VhT42A0C/LbqX8qwxGJlM3SiQrtmFvpP1yXZLtim6l3GlespTY1MbAJuWHHcQmPtD0Jyyrgp323rAA6H7LiJhyANNK/Jr8tTphr+T0OKb4HzCcOw+VlLX+AOuMO1+TkE9wCFHj+TikjKtiWDTxhXL9JLHpJ4Momhk+AXbPnd435TgBDATdOr2qV5X2QsFrFx0lrrdAJD6Dwim51SkCrEJbbCCIYqvrywesHcDp7vBEeOL6KxPjdg1rVNAXp3FqXcL07+wZ7n2QUJP+PDqK+Xd48eZBnKVok3EiVAqg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyH-0007oN-Iu for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 41/43] build-system: tree-sitter: Redefine tree-sitter-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:05 +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.175498959229910 (code B ref 79224); Tue, 12 Aug 2025 09:07:05 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:32 +0000 Received: from localhost ([127.0.0.1]:51929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxk-0007mH-CZ for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:32 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:53509) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxQ-0007hr-Ey for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:13 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbR1gmcz20wL; Tue, 12 Aug 2025 09:06:11 +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:06:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.115]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbQ6t6Cz5wcS; Tue, 12 Aug 2025 09:06:10 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 466B53E325E; Tue, 12 Aug 2025 09:06:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R00292b3c7c6-2a75-4f1e-a2ca-becc75e52e63, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:49 +0200 Message-ID: <20250812090457.19016-41-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: 289074801908966114 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepleenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ITZ5+ITfBAJ7cGW2IhtGiN8YM9IzU3clsHUtb1Sy5Fw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989571; v=1; b=bfP4GCVN3O7wyZM7Pf/70m5ETC8qjUDJ6HYEAxotrozvWCRq48FVlAcnqHZof0fhqw+ai/ne p9oE4TgEQc9q2mfnk+3+gFUKou8QEpLpCfkkszXZaOSk5D4UOpCwgSc32Vrj31EbYNUtDu9VfDP adJgpeoF7/Ei3cB1R/Ce2nHTB/ToFdYig7aRYcitQ+02oJdR/uBfUAXy5n6oWHvNcxMH7JxJxkF 3b/w0/Lo8YIKSqD56iZSdUXfemD5/MD1/GB+dRipkiTSFAcJ9p6UEmKfqHH7U4An8bAR8estwDR RNTewn5O6JwbByxDAW7oXFs+mpv8/UvnTTvVnGF3nNygw== 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/tree-sitter.scm (tree-sitter-build): Monadic procedure returns a gexp instead of a derivation. (tree-sitter-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I761d0663a511deefd0626ad427be22df09b72894 --- guix/build-system/tree-sitter.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sitter.scm index 90d9704cb84..ce165788ec6 100644 --- a/guix/build-system/tree-sitter.scm +++ b/guix/build-system/tree-sitter.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,11 +128,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (tree-sitter-cross-build name #:key @@ -189,12 +187,8 @@ (define %build-inputs search-path-specification->sexp native-search-paths))))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define tree-sitter-build-system (build-system From patchwork Tue Aug 12 09:04:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43388 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 B72F427BC4A; Tue, 12 Aug 2025 10:08:05 +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=unavailable 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 585A527BC49 for ; Tue, 12 Aug 2025 10:08:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyQ-0007h9-PS; Tue, 12 Aug 2025 05:07:14 -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 1ulkyI-0007Yd-Qp for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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 1ulkyI-0001Vi-AY for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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=awxPDHysrBMiOOWz6mzWHQPp0zLgSSvieggSypVwFkQ=; b=RS+AvdDVX3J1WmD23QxkgKX20oqXFjkN+MMHyErOx165nO5XB1i4ASCCXyj52SP/3Fk25bV0tqKwo73986qJfl5ReQFK7iSzVasqN0YIX7KnCy3w3+T4H655NWREbBA8pPW4fj5zEO/l/pZciwQqruVm6/dW0usQ/AGlsNaJtlmuXhNoEZNzJiAf9X4beEz+PRee4ynVcWWbgenHLH3un/XPuV6jBF3lJN82hP1mFqYowRq3BLB8V+iJ7zLaTOyOz1FtkRGkzvf0siLWDYGBaKdAxZkVtMko98KorrIKxvMsAKE4Z9uVfYnJHTtJh0rwuIy2S0uGq/9t2eqbf/iqow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyI-0007oU-21 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 42/43] build-system: vim: Redefine vim-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:06 +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.175498959329919 (code B ref 79224); Tue, 12 Aug 2025 09:07:06 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:33 +0000 Received: from localhost ([127.0.0.1]:51931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxl-0007mU-Bc for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:33 -0400 Received: from 9.mo562.mail-out.ovh.net ([46.105.72.114]:41311) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxS-0007iJ-9F for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:15 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbS3xmvz1yVX; Tue, 12 Aug 2025 09:06:12 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:12 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.16]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbS2jmCz5wDm; Tue, 12 Aug 2025 09:06:12 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id DAC31B8326A; Tue, 12 Aug 2025 09:06:11 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003cf4b506a-512d-497b-831d-17a49f9cd8dc, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:50 +0200 Message-ID: <20250812090457.19016-42-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: 289356276468671202 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepleenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=awxPDHysrBMiOOWz6mzWHQPp0zLgSSvieggSypVwFkQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989572; v=1; b=hX7JdKK8rPCVZsX7/oYKiX3ZjniPNoQOwtItDJJxnOM7W2fj892W8Yizn+PjRsps0AZUswnN SGmxMy08r3xYwedMeClMiU/jV2a1tV4IuomsX3TS8jKpkyGgblwJS7tZ5+WQZ2TbkmQsGHrU38W wCKWwE0Ov12aZjcz/lYSkUluEWvpPcp26HKfhYB8uC8DXdlMw2pIsqtcNaTw1jXynHAI7tmnIGr T/FJY9glK21O6uSsp9vzNhqdEE1e/uNmBRP4J8FsMJGDL3IzQewddwh51gkeukkZwLMmn8BztBk UAXokrbUsOe4HhgVTjU4SA7qpfOSVWkr0AWfO2TZXGZuw== 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/vim.scm (vim-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Iedbb15faac445f169cffa16397b357bc4f15c0f6 --- guix/build-system/vim.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/guix/build-system/vim.scm b/guix/build-system/vim.scm index dddf7ea14b2..22c38aefcab 100644 --- a/guix/build-system/vim.scm +++ b/guix/build-system/vim.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Jonathan Scoresby ;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define* (vim-build name inputs (modules '((guix build vim-build-system) (guix build utils)))) - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@modules) @@ -151,16 +152,8 @@ (define build #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad - ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name - build - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define vim-build-system (build-system (name 'vim) From patchwork Tue Aug 12 09:04:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43371 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 4C70027BC4A; Tue, 12 Aug 2025 10:07:31 +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=unavailable 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 1589727BC49 for ; Tue, 12 Aug 2025 10:07:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyL-0007bv-Ct; Tue, 12 Aug 2025 05:07:09 -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 1ulkyJ-0007Z8-21 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:07 -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 1ulkyI-0001Vu-OR for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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=VOD3JsBdCQTQZrWMus0MvxGqYfVQb0TH12m36qmVSBQ=; b=JMJa+/DV9Sb6Jww5Tr4oS7wls16aE/FzI/LDrjdlOURE35ml3C1D7fPJQXyz/6k9xgv0B94ajaTEaMQbJ5ovE0YRMtPu4RNkHlXYUsWhLUF2i6203AqCZv5LnOEDRB3IPUL7OKHXLxndvVCQ2P0ho08zt8+DnWbRcMOyzofSvKg/xuN309lfK68vRL58AKfaDMoJI+d1XZN5bzM4TS72WFMHouCx1wlUh50JroDVEpjY/vw30T0rAu99kkqh0o/KOjHH1yWSlbww4v6h2tKXvsLMa/dljYq0ngBqXQ7TRfLgA9ejnsIB0t8LwbHvewqDV+oIFhSSyhHql57AsXWKqA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyI-0007ob-Hc for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 43/43] build-system: zig: Redefine zig-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:06 +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.175498959429925 (code B ref 79224); Tue, 12 Aug 2025 09:07:06 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:34 +0000 Received: from localhost ([127.0.0.1]:51933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxl-0007mW-Px for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:34 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:43203) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxT-0007if-0G for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:15 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbT678Pz20xd; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.27]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbT59kNz1xrh; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 4F50B783280; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G002c9804b44-bae9-4c3a-8c90-6b3129d2212c, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:51 +0200 Message-ID: <20250812090457.19016-43-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: 289637752566047458 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=VOD3JsBdCQTQZrWMus0MvxGqYfVQb0TH12m36qmVSBQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989573; v=1; b=f03t/iL4h9oyLYN8S5izi87XREsMEZhRMZq29ml36A32ZO+F0mS0Yx29qww7S2CaeAHcPZII 8pjnzYTaMX2rKla6efUzIsEHb39zvR9yklhbWXqkidOHyNfEXYMnnT6WCJI1jZQ71AF1V5YrTrF r76euXCgSZ+AvX8p4cki5SEgEgc+U+lxD/XLtRSirJIulHLM+SRM5ktHqJAccsPqgWF1wqNnIw2 dAl9HFpghRs71+mRXt0RjDY8+alp3cZERKWxeNj3jAVbTzSj5DnHBnKetRwJBKuvxOfQBJiF+E1 aMbqGvFcr8+ocPoixnwwjwUri2XPtQGyl5lND1mh/mmtQ== 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/zig.scm (zig-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ide64e7047d6e7127024471b311366f3cf8533e00 --- guix/build-system/zig.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/zig.scm b/guix/build-system/zig.scm index 5d95e0bec49..d9190b9aa4e 100644 --- a/guix/build-system/zig.scm +++ b/guix/build-system/zig.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Ekaitz Zarraga +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,11 +94,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (zig-cross-build name #:key