From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id +AjPFu6sm2XqQwEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:06 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id ICSbEe6sm2UXAAAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:06:06 +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=1704701166; 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=RdvlIuEUhyD1rwxUIbjwZ93XOkn04v+2UVliYP+6fSQ=; b=QCE2w3gUBSSUWd17Myp3AcpvNp0o+ydL7q9cPf+lWYlj0SJ54tVwXfbHG0alCkc6aLe7D3 ZV5BAVes3rgRyA+isbCmF2FumGC4qQSopxJC9zJB02AK6RecMeVFQ+tjsGkPqoIMMC4Rnp kAsc6fRTWu/POD8MosLXUmCr7JLy44qE0h0TdGjYqZAZyt69e0223WNtcD56aQNxrS+tvV DXiqbBKwa7O4lKMy6FIhHpwhVs6cZPKAIngR/5njAqzy7yK3MBRIA9K05Db4qI+6Yr4+M+ Dj486V+bR5aX+TZ3Dtg7BMcr08cI+5xRmybbfyE8uA13rRS/zLe3MzaBXoy6Zw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701166; a=rsa-sha256; cv=none; b=cJ5/xW7ARLcRFzRLxb9M6Jy2co+f2+bz49DB4HPjd52of6uG4kHOEm4lBCjnFvEE0xejvd EDIUKER6ulWd21r3w/4Av+A/8KOrRkUtyelEBWvqycEzwdZIKcVlViO3jJYVJpg5fXn7xE 5cHReCQhjchsAue+2g5H915SpHY3vkXOeTXoEmqyREj2pzMt/Zn+DH2WG5Zsg7m/tNFBS0 B9UUzfrFoBcK+ONra3UaaGGQ+5ddB3++L1bHJq0I27IxEP626aK6eeG/p23deJsRn6zhuQ mYEzpBvD/Ohqh5SDOKTMjGCtoebdjS8hsNZEx7kn2aR4jhMWOM0+IIkM0xZLcA== 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 0EE64439E5 for ; Mon, 8 Jan 2024 09:06:06 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdB-0003Ow-TV; Mon, 08 Jan 2024 03:05:09 -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 1rMkd7-0003Kk-Eo for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:05 -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 1rMkd7-0002zY-57 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdD-00082t-5e for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 17/48] build-system: emacs: Redefine emacs-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:11 +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.170470107230384 (code B ref 68315); Mon, 08 Jan 2024 08:05:11 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:32 +0000 Received: from localhost ([127.0.0.1]:34952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcZ-0007ts-TQ for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:32 -0500 Received: from 8.mo582.mail-out.ovh.net ([178.33.42.204]:58557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcS-0007sE-CX for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:25 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.148.49]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 06D6329135 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:16 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-sxmkg (unknown [10.110.168.164]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B298C1FE60; Mon, 8 Jan 2024 08:04:16 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-sxmkg with ESMTPSA id jtPpKICsm2XQCwAA7T9DbA (envelope-from ); Mon, 08 Jan 2024 08:04:16 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:49 +0100 Message-ID: <20240108080350.1665-17-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: 12429934974644576994 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht 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: 0EE64439E5 X-Migadu-Scanner: mx11.migadu.com X-TUID: iaKpPu1XtsFn * guix/build-system/emacs.scm (emacs-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I89cc8c1171eef7c5e02e35df5e1298ce3813c1b5 --- guix/build-system/emacs.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index ebf97a5344..c16771ad76 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. ;;; @@ -116,11 +117,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 emacs-build-system (build-system -- 2.41.0