| Message ID | 20250812090457.19016-21-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 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 <patchwork@mira.cbaines.net>; 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 <guix-patches-bounces@gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <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:14 +0000 Resent-Message-ID: <handler.79224.B79224.175498956029409@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.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 <debbugs-submit-bounces@debbugs.gnu.org>) 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 <ngraves@ngraves.fr>) 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <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/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 <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; 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