From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id YM/EKf6sm2U2awAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id mI6dIv6sm2WArAAAe85BDQ (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=1704701182; 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=tJt17irfdYA4MmGHP39XLJe3oKeewzVXgKy+D1Iu0dA=; b=n1Acd+cWNqUZmnPkICV4gSDCRY8bDvp5vA35sOtIJzsCKj7hceb5QcGgRXUNWBDs9mkJR5 pEFcjX6ITSkUVFvWxhyLCH4QZmNJaVPyGQXs5hBjdxYxKLC/NR8vguSTnh7TTNq5cJ3F/x OLr9GLJ5xKkH1/f+/z1tqY2wjeC3/by5WExhoZYdIGjehzNM+cMBx1DtixbfqVAVbVd8Ah ak68O9W0fcRczc8vZXHlXj+0g1rEo/2b0XShXLHTc8srvR9J1IscSV3Mq6tqaodoBOjPyc 85J+8fedzNflbYPnu6wSLif8wYdGE5k0AekO2jS909zhTE75TQ9B6b/81R7N1A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701182; a=rsa-sha256; cv=none; b=HJ3oMIaBQEajH8Rc0d4GeqK9zbN0wq345NqRVBzWOjD/vEN2wiYsPz/3MGFnVaiElYANGp 1tiI7T2UBkxhe0a1NXe180s2GdKKMTNyF4uo/hAvTM7cONxIa/WCMTdyNKnLbNLl3BY46X rlQ4MwsqKjkzxqGLIoyRnXZTaXYcryUFKWSD0DPOJTjRtGjfV9qryK2dN7XZFKANGeP2Tc +86ivzsc1jzF5mXun9oV1zSR9vLI8T/+18puTXw6e9WMSMgDzs5VU43QRm4J5TCcRwcGBR 6PzffcYxNZtSTAIwancGLJxvrzOQ2Z/1ZUut6Ms5KZp9v2jwjDbdKqym+0SvFw== 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 59A4517B28 for ; Mon, 8 Jan 2024 09:06:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdN-0003c4-7j; Mon, 08 Jan 2024 03:05:21 -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 1rMkdJ-0003YV-5h for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:17 -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 1rMkdI-00034G-RX for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:16 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdO-00086C-MG for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 43/48] build-system: texlive: Redefine texlive-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:22 +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.170470110630831 (code B ref 68315); Mon, 08 Jan 2024 08:05:22 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:06 +0000 Received: from localhost ([127.0.0.1]:35034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd7-00080y-Gi for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:06 -0500 Received: from 18.mo561.mail-out.ovh.net ([87.98.172.162]:44647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd0-0007yi-OH for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:59 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.176.101]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 8B71C297FF for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:51 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-k2mrz (unknown [10.110.178.32]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 409771FE75; Mon, 8 Jan 2024 08:04:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-k2mrz with ESMTPSA id VDOpDKOsm2UGngAAWDRaQw (envelope-from ); Mon, 08 Jan 2024 08:04:51 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:15 +0100 Message-ID: <20240108080350.1665-43-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: 12439786599361798882 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuthdpughkihhmpehprghssh 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.81 X-Spam-Score: -6.81 X-Migadu-Queue-Id: 59A4517B28 X-Migadu-Scanner: mx12.migadu.com X-TUID: hIz7q/sAilhL * 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 88372faa58..8f5966c5ae 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. ;;; @@ -178,14 +179,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 -- 2.41.0