From patchwork Tue Aug 12 09:04:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43391 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 64E8127BC4A; 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 319FF27BC49 for ; 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 ) id 1ulkyO-0007g8-AG; Tue, 12 Aug 2025 05:07:12 -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 ) id 1ulkyI-0007Y5-Hp for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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 ) id 1ulkyI-0001VJ-8s for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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=Aoef1QTmDWPq2JYBd7y1dLXVErLbtwTECEAKFDO9Kxk=; b=GnZeTMhqtjOkhuss7S/SdTylkAhk5F/lAmBpfvvajhRMG3ZC+XfoU0yoMPHjXGdsvt3009jo+VEXRoT1obKQd+/1nR+pyAdjf4QbzIx+KWN3lSu+bY4y5ILTu6BJoRXYXe8VOtc9aSEF/PM6xbAMUDlr/wIoWCY5CkmmvVgHVJRGJnGM6IAIsAdDZ3SWu7AyHbZDEOw9sAz7HGZmSb5t7uZZ/IsnIbBAms6XGrDdlF2zcbO7uy5yoQfQuHS7IYtzbYfYX1dQ+MRTkuOOju60JOqvQqLisQKKJoEpMaf2emx0TfXS4GuIHVlL9yy/ECuJbL3haAbhoAbO2XXfEManQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyH-0007oF-1y for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 40/43] build-system: texlive: Redefine texlive-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:05 +0000 Resent-Message-ID: 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 Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498959229904 (code B ref 79224); Tue, 12 Aug 2025 09:07:05 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:32 +0000 Received: from localhost ([127.0.0.1]:51927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxj-0007mD-Qf for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:32 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:45691) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxO-0007hb-Qs for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:11 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbP5nrHz5y85; Tue, 12 Aug 2025 09:06:09 +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:06:09 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.80]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbP4SR3z1xrP; Tue, 12 Aug 2025 09:06:09 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 26C418E327B; Tue, 12 Aug 2025 09:06:09 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003421abbb7-2e3c-48c3-b191-46f9a5848fec, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:48 +0200 Message-ID: <20250812090457.19016-40-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 X-Ovh-Tracer-Id: 288511851375944418 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Aoef1QTmDWPq2JYBd7y1dLXVErLbtwTECEAKFDO9Kxk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989569; v=1; b=xTcnTtmWEs89nvZDxGmEnuFQvP5wwFuzgN/NMPwptek/rMYO+UgIUiKeU/+qEw3QV5PzBAbS QTVa0Ge1es7reL861WUUBo5rDRh01KYA2DvDUv9twUzF0OLeItUm9RFBpMKlKgiEcEGm90Lb85x fjJHggcdIhvoz/qje7UMjs282+l0Rc1qdYj0lJUYqdJiOsvhKRj+c2ruQL+fMutbdt5FjZ4Mz5E Rw2KP6gpcrpJh8ccwZr9stQHRBF3Ck3umZ95zg8GrL+40T/kk9/EU751FP+qHeYMGTN5ifBrvYt LidxuRavREmzDLTPT7a68nFQQ4stoO4hnEHvawKrPsvfQ== 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 X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * 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 35587b50fc0..b5b687e4e46 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. ;;; @@ -151,14 +152,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