From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0CZdAf6sm2W6/QAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id yAbbN/2sm2XsAQEA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:22 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704701181; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=mNqGK6pdFHbNpSI5wT+bEr4uXNTn70n49ubC2S4et44=; b=h3Y7F/jeo2FSNp8jCRwmjZ+408Y1CIuHmwaVTjpIEM5URYcNutalE7KZrUAPnVY9u9jtSr XG4Rw8d+z1JaNEIWpiXOoarPL77dGQaAKU56AEdFZ3MBZ2ldnMe7OWeYS/bGaNyPbPoLNu YIrSd0qY4JdLVS1t9+Jx+hRmukj1FbFSnocDDJl645ha0WbEpkVozk7mDBsXirNj48CiLq ZJrQJs1u4sl2NiN1FbPqEqMVt3WRq5l4vwzuF8ffR9vKEZgpXrI04Z77SSFA4U/mgrodp0 N99gmiObbkr62PhzXFr/ZlJ/P3MFvD1Mo4b1ePtfQHmFSIpR4xN58TPnEpPxkw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701181; a=rsa-sha256; cv=none; b=NsLw5+xasGViilPpzdcs5kuvOTWirERg9BCqbHwaIYXOsTWih8zWNrGXdHuKL0cx+YFTxy foYIgUulbuq3Itvtdi/N6bVMKh6t0YJqp3DTSAC9uYEbG5s8hXvnWmQ9txWTndPmlK7D24 NRFOKQnjkRTloJrkSMJ1Mw+dowhagxWDBUfOTor7nUy9Bd25O6OfeWEclvxu4RcLtLbEWn ed28TtAdS5Smd3ZgFifMkhYaq+FIEKae4+gey63SDPaNDhDKdvQKVRDFYR+ymAHoMXXoaj N2BYV93gMR/c9vvEYNXh8Pdv96r8dS7iqxMD+cyfkOrJkRfP3BfmZbno8cr8UQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B556E45217 for ; Mon, 8 Jan 2024 09:06:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdE-0003Qh-7P; Mon, 08 Jan 2024 03:05:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMkdA-0003Ni-Id for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMkdA-00030R-AR for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdG-00083i-B0 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:14 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 23/48] build-system: haskell: Redefine haskell-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68315@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.170470108130486 (code B ref 68315); Mon, 08 Jan 2024 08:05:14 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:41 +0000 Received: from localhost ([127.0.0.1]:34972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkci-0007vb-V5 for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:41 -0500 Received: from 6.mo581.mail-out.ovh.net ([188.165.39.218]:57935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcY-0007ti-MY for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:31 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.9.32]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 25F952660B for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:21 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gc8lz (unknown [10.110.168.168]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 96A9D1FEA6; Mon, 8 Jan 2024 08:04:21 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-gc8lz with ESMTPSA id V4RIHYWsm2UmIgAAqBvOJw (envelope-from ); Mon, 08 Jan 2024 08:04:21 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:55 +0100 Message-ID: <20240108080350.1665-23-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr> References: <20240108080350.1665-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12431342350645584610 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.79 X-Spam-Score: -6.79 X-Migadu-Queue-Id: B556E45217 X-Migadu-Scanner: mx11.migadu.com X-TUID: c/ldh0T+XNx2 * 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 f8568e33db..31561654d8 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 -- 2.41.0