Message ID | 20250812090457.19016-29-ngraves@ngraves.fr |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> 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 <patchwork@mira.cbaines.net>; 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 <guix-patches-bounces@gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <ngraves@ngraves.fr> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:19 +0000 Resent-Message-ID: <handler.79224.B79224.175498957729730@debbugs.gnu.org> 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 <ngraves@ngraves.fr> 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 <debbugs-submit-bounces@debbugs.gnu.org>) 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 <ngraves@ngraves.fr>) 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Reply-to: Nicolas Graves <ngraves@ngraves.fr> X-ACL-Warn: , Nicolas Graves via Guix-patches <guix-patches@gnu.org> From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org> 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 |
Series |
Extend bag-build to gexps.
|
|
Commit Message
Nicolas Graves
Aug. 12, 2025, 9:04 a.m. UTC
* 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 <julien@lepiller.eu> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (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