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 CBeHOyitm2X4rwAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:07:05 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id oHsbNyitm2URKAAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:07:04 +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=1704701224; 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=RgvmPSXR8x3hrSpVMk0n0CqIcgwm5yPB+ReL3r+6hJQ=; b=hpDIPsNG3wcvKFN0t3c9LfDmUXAgREd0NTQ5ljxDLP/R/pe6W/a6x5+qbLxEmTG6GuMmnd hUWfd8/i7WA5DkbUCqR1iaMu6cxrhr2ZZUWM+PbC8VcRGrSzw53T6a9KYByHzuZfBF3zL1 dHo36LLryTycLjAIVUeWpXLu/Xm5BkGNPRkeqsS+Km9dJ+bcEH+yOPpyaXspbrjSQHLib8 LiuMIC+JLlpkZ5UkbBrJmyUkr7ISH6K5rFm/nY+noUWE+/NpOThSS2im88awLoaxkC8eWz mOp4bP7lBsPTmpjwjmNrJ6G0cCkgzSGAy5cIrB/hCGM3EL5HEySaf3t7cA8jgg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701224; a=rsa-sha256; cv=none; b=QGf33ubaohDb4qqSxs6bStTbmpUTiS3uiuq69KZKn8ghilXWCi/o1e4hiJJNGeafahtRMG PnNvI6X8CGdcs7zzNH6GOtYuDOL4UrgRBW1bf1m2U5iC6d7UATn7zMuCAsGePteKhICTsT pI8Yjt/5yzaSV9r8BHlOg/BZ4uXMmj4J/8IeefX9C11L33nSa/pKstSFJxcriatcFrwqlq yyGCwdkvKOI4ORuighsP4TdbQH5rXV4bgCGVeHCVgw61DvH8Tj86Pz6rDISn4XBTG/a6Il HgzI70o6SOwiDb5fTSRm843aK94cWQ3AkUA9mMIreU2RALEeELreWeJhDDPj/A== 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 CD52277D2A for ; Mon, 8 Jan 2024 09:07:04 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdE-0003S1-Pl; 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 1rMkdC-0003PD-Hy for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:10 -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 1rMkdC-00031N-9l for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdI-00084M-AS for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 28/48] build-system: minify: Redefine minify-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:16 +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.170470108330533 (code B ref 68315); Mon, 08 Jan 2024 08:05:16 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:43 +0000 Received: from localhost ([127.0.0.1]:34982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcl-0007wJ-7A for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:43 -0500 Received: from 6.mo560.mail-out.ovh.net ([87.98.165.38]:56277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcd-0007uz-T3 for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:36 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.25.249]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id A29B6279A1 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:28 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-wj7t8 (unknown [10.110.168.31]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 544C81FEAB; Mon, 8 Jan 2024 08:04:28 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-wj7t8 with ESMTPSA id cI9nDYysm2XzIQAAa6Wlyg (envelope-from ); Mon, 08 Jan 2024 08:04:28 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:00 +0100 Message-ID: <20240108080350.1665-28-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: 12433312673429250786 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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-Queue-Id: CD52277D2A X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.81 X-Spam-Score: -6.81 X-TUID: 8mDh2SIbg/fb * guix/build-system/minify.scm (minify-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ib009adcec6791d7145ce0d822745495dad9cf6e5 --- guix/build-system/minify.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index b377b506b5..a7536520e7 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2023 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,11 +98,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 minify-build-system (build-system -- 2.41.0