From patchwork Sun Feb 9 00:50:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38365 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 6E64427BBE9; Sun, 9 Feb 2025 00:54:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 80E1D27BBE2 for ; Sun, 9 Feb 2025 00:54:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZL-0003zk-2Z; Sat, 08 Feb 2025 19:53:07 -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 1tgvZJ-0003yy-MI for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53: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 1tgvZJ-0007lq-3T for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:05 -0500 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=fj/zv+cHn0Qm+b/oe0PmcPon3plbhBFKvudsgzeDDDY=; b=kBgTJdyLB79FocVPc1Oj+m5tIi+7dFfWLgaHFF3JrTW7suFu3xVewR+9gK84eVIy1Hz7pWW89vxsEZJBHPYEy+X2NsvhBa3IRidO0c1fq1QSCxIL4uSCDzjxF7N3kqp/oFXW1xPQzFzL5IrNnHgOSVaYWMoTHKcl6VsAXv2QDDYgGx+ysrIuG0GwSPmF9KLCEh/6YoKaOWU3D3EmcgWLsx266NXl9F2sd3cXaZ0av8fGh5DsW0xQDnBNVx18XznMoklYyJfkgG8XQ4S4+zRxoioH/fR6AZH4Sg4lXz1rIQdoBqkk2nIMEFVChl/H7EyKlb3OEJ/CsVmMUpyOtVXR0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZI-0007C0-Sn for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 01/47] guix: packages: Extend bag-build to support gexp. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:04 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235027199 (code B ref 68315); Sun, 09 Feb 2025 00:53:04 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:30 +0000 Received: from localhost ([127.0.0.1]:41960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYj-00074a-Nd for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:30 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:49973) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYf-00073n-Ar for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:26 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.148.146]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lb2mY5z1chM for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:23 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-p6vbc (unknown [10.110.178.46]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D0ABD1FE0D; Sun, 9 Feb 2025 00:52:22 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-5b5ff79f4f-p6vbc with ESMTPSA id ZeVHHUb8p2e5+xgAojLzUA (envelope-from ); Sun, 09 Feb 2025 00:52:22 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G005e4afb2f1-2f72-4e51-ad53-1c310967cdfd, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:41 +0100 Message-ID: <20250209005219.25070-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18178498421062230754 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=fj/zv+cHn0Qm+b/oe0PmcPon3plbhBFKvudsgzeDDDY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062343; v=1; b=xXLgEi3Zc2oNxbXVEY1PKt9t2/1M2aN+CNbzyAUYQe+l98ZJOMBBrePAiLWILC+q0YUrurjf wywWvEwqbfXRPMcpMHg5vT8+X4G/dp3+S1KoA7p+tiAtrahx0xkWoVotleN79bj6BaP/lPMTozq ZY7wEKVICATz3pqtZQ71qoPYhhmBdAf26kaxnH0aH95vdtlMJUMAWC7XVxveIbhE6rjN+1ZbujF kDqUOCL8P601baIFwoHOtxkOCKAuNqNTFcWAYA2AbZXcz6LJNXDU1H7PB3vLhhXTKLXyuz173KG 72Zx1eCHI+WLrS1KDVzkhr5T4eDUunIwQ0IRtspFl60MA== 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.scm: Update comment. * guix/packages.scm (bag->derivation): Rename function to bag-builder. Create new function. (bag->cross-derivation): Rename to bag-cross-builder. Change-Id: I56c5a9dab9954307f95b29eab5e02ee058271684 --- guix/build-system.scm | 2 +- guix/packages.scm | 53 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/guix/build-system.scm b/guix/build-system.scm index 76d670995c..a4dcdc52d8 100644 --- a/guix/build-system.scm +++ b/guix/build-system.scm @@ -79,7 +79,7 @@ (define-record-type* bag %make-bag (default '("out"))) (arguments bag-arguments ;list (default '())) - (build bag-build)) ;bag -> derivation + (build bag-build)) ;bag -> gexp or derivation (define* (make-bag build-system name #:key source (inputs '()) (native-inputs '()) diff --git a/guix/packages.scm b/guix/packages.scm index 78726b089a..5b9ccfe3be 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2023 Simon Tournier ;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 David Elsing +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ (define-module (guix packages) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module (ice-9 regex) + #:use-module (ice-9 optargs) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-26) @@ -1962,12 +1964,12 @@ (define (input=? input1 input2) (derivation=? obj1 obj2)) (equal? obj1 obj2)))))))) -(define* (bag->derivation bag #:optional context) - "Return the derivation to build BAG for SYSTEM. Optionally, CONTEXT can be -a package object describing the context in which the call occurs, for improved -error reporting." +(define* (bag-builder bag #:optional context) + "Return the gexp or derivation to build BAG for SYSTEM. Optionally, CONTEXT +can be a package object describing the context in which the call occurs, for +improved error reporting." (if (bag-target bag) - (bag->cross-derivation bag) + (bag-cross-builder bag) (mlet* %store-monad ((system -> (bag-system bag)) (inputs -> (bag-transitive-inputs bag)) (input-drvs (mapm %store-monad @@ -1989,10 +1991,10 @@ (define* (bag->derivation bag #:optional context) #:outputs (bag-outputs bag) #:system system (bag-arguments bag))))) -(define* (bag->cross-derivation bag #:optional context) - "Return the derivation to build BAG, which is actually a cross build. -Optionally, CONTEXT can be a package object denoting the context of the call. -This is an internal procedure." +(define* (bag-cross-builder bag #:optional context) + "Return the gexp or derivation to build BAG, which is actually a cross +build. Optionally, CONTEXT can be a package object denoting the context of the +call. This is an internal procedure." (mlet* %store-monad ((system -> (bag-system bag)) (target -> (bag-target bag)) (host -> (bag-transitive-host-inputs bag)) @@ -2033,6 +2035,39 @@ (define* (bag->cross-derivation bag #:optional context) #:system system #:target target (bag-arguments bag)))) +(define* (bag->derivation bag #:optional context) + "Return the derivation to build BAG for SYSTEM. Optionally, CONTEXT can be +a package object describing the context in which the call occurs, for improved +error reporting." + (mlet %store-monad ((builder (bag-builder bag context))) + (match builder + ((? derivation? drv) + (return drv)) + ((? gexp gexp) + (let-keywords (bag-arguments bag) #t + ((allowed-references #f) + (disallowed-references #f) + (guile #f) + (substitutable? #t)) + (mlet %store-monad + ((guile (package->derivation (or guile (default-guile)) + (bag-system bag) + #:graft? #f))) + ;; Note: Always pass #:graft? #f. Without it, ALLOWED-REFERENCES & + ;; co. would be interpreted as referring to grafted packages. + (gexp->derivation (bag-name bag) gexp + #:system (bag-system bag) + #:target (and (bag-target bag)) + #:graft? #f + #:substitutable? substitutable? + #:allowed-references allowed-references + #:disallowed-references disallowed-references + #:guile-for-build guile)))) + ;; build-bag has to be drv or gexp, else raise. + (_ + (raise (condition (&package-error + (package context)))))))) + (define bag->derivation* (store-lower bag->derivation)) From patchwork Sun Feb 9 00:50:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38360 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 168DF27BBEA; Sun, 9 Feb 2025 00:53:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 83DBC27BBE2 for ; Sun, 9 Feb 2025 00:53:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZR-00042B-N7; Sat, 08 Feb 2025 19:53:13 -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 1tgvZL-0003zn-9B for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:07 -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 1tgvZK-0007m4-Je for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:06 -0500 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=0AAT38QsZjcX5IExL4nOr5LIIWE+BqVfhVYghqKYgoY=; b=SVkrhvhkVRGKYhsHMPYNtsR+hvfy2ht4DBe+9U9kLMlxKPxgIq8HGvCwe470eMjJhX97Kn0jckfLs7CxmhjT9Kl0PVUAiVtZ1oQQhkOtsFga7AO7Ac8HOi/fAQZGRcx78OmAHnLUve9Utj8lxc+ssfqFouTADjbeGjcdgHxDzR0X/jtlOsRKRrn4lkqSZyXMjlzyu09bD+hMl844tpmbdqw7AjF5UWrIkdysdpjDrfhmL6p5p1HkyGPAX8DRmrghCO/SxZuSNx9bHrTJzqIl+4bsYINl+rzA+o+fS/9Z0NjOZWJRgJZM/U0gXQntZgVEYHdI40cVOfv5/4J98PIwlQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZK-0007CR-Az for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 02/47] build-system: gnu: Improve gnu-cross-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:06 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235627258 (code B ref 68315); Sun, 09 Feb 2025 00:53:06 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:36 +0000 Received: from localhost ([127.0.0.1]:41974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYp-00075N-Gi for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:36 -0500 Received: from 14.mo550.mail-out.ovh.net ([178.32.97.215]:42719) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYg-00073p-Gd for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:27 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.2.72]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lc41lSz1V3G for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:24 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-rq4j6 (unknown [10.111.182.117]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0B3341FD2F; Sun, 9 Feb 2025 00:52:23 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-5b5ff79f4f-rq4j6 with ESMTPSA id R8fjJUf8p2fwIwAA3hGPtA (envelope-from ); Sun, 09 Feb 2025 00:52:23 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-110S0048b74fffb-f330-4013-b1e0-869e89de843b, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:42 +0100 Message-ID: <20250209005219.25070-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18178779896502412002 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=0AAT38QsZjcX5IExL4nOr5LIIWE+BqVfhVYghqKYgoY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062344; v=1; b=XDH261ynVcl2B9Uh3Lhsaeops++DNK0X4FH8jCbYYmu7P428RzmdL5vWelpqaxZh1j/zQR71 0f6WmFvx2D3Bcs/32Aj7cgtQBN4GW5bkYoI5XTY3ZnUAay90iqGfheCGpwWqaMnUbaQwivyY3OJ Z/m4ZbAsgYdpFwQiL3rjrPTMXZLdVMkf0ePLKSEzwcS8mGhVkqyjL1T2cAEGDXnpByofQpLJDBA jjDWlycUyBrG7VJxa8yRvcwENyZYjdex7+n5up7sBcp0IzSAYXGjY6PR7NtGPBlcP7PNoqJtXKU ZUhmWFv9QOQ+teuZgbbG2bUg+CN7m0H1R2N+RGWG8PNIw== 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/gnu.scm (gnu-cross-build): Use with-imported-modules around the gnu-cross-build builder gexp. Change-Id: I47246571b1d84a82a67a8c289fd5ad4b5a3b5aeb --- guix/build-system/gnu.scm | 96 ++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 3a314d34b7..a71162c300 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012-2024 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -520,59 +521,60 @@ (define* (gnu-cross-build name cross-built inputs, and NATIVE-INPUTS are inputs that run on the build platform." (define builder - #~(begin - (use-modules #$@(sexp->gexp modules)) + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) - (define %build-host-inputs - #+(input-tuples->gexp build-inputs)) + (define %build-host-inputs + #+(input-tuples->gexp build-inputs)) - (define %build-target-inputs - (append #$(input-tuples->gexp host-inputs) - #+(input-tuples->gexp target-inputs))) + (define %build-target-inputs + (append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs))) - (define %build-inputs - (append %build-host-inputs %build-target-inputs)) + (define %build-inputs + (append %build-host-inputs %build-target-inputs)) - (define %outputs - #$(outputs->gexp outputs)) + (define %outputs + #$(outputs->gexp outputs)) - (gnu-build #:source #+source - #:system #$system - #:build #$build - #:target #$target - #:outputs %outputs - #:inputs %build-target-inputs - #:native-inputs %build-host-inputs - #:search-paths '#$(sexp->gexp - (map search-path-specification->sexp - search-paths)) - #:native-search-paths '#$(sexp->gexp - (map - search-path-specification->sexp - native-search-paths)) - #:phases #$(if (pair? phases) - (sexp->gexp phases) - phases) - #:locale #$locale - #:separate-from-pid1? #$separate-from-pid1? - #:bootstrap-scripts #$bootstrap-scripts - #:configure-flags #$configure-flags - #:make-flags #$make-flags - #:out-of-source? #$out-of-source? - #:tests? #$tests? - #:test-target #$test-target - #:parallel-build? #$parallel-build? - #:parallel-tests? #$parallel-tests? - #:patch-shebangs? #$patch-shebangs? - #:license-file-regexp #$license-file-regexp - #:strip-binaries? #$strip-binaries? - #:validate-runpath? #$validate-runpath? - #:make-dynamic-linker-cache? #$make-dynamic-linker-cache? - #:license-file-regexp #$license-file-regexp - #:strip-flags #$strip-flags - #:strip-directories #$strip-directories))) + (gnu-build #:source #+source + #:system #$system + #:build #$build + #:target #$target + #:outputs %outputs + #:inputs %build-target-inputs + #:native-inputs %build-host-inputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:native-search-paths '#$(sexp->gexp + (map + search-path-specification->sexp + native-search-paths)) + #:phases #$(if (pair? phases) + (sexp->gexp phases) + phases) + #:locale #$locale + #:separate-from-pid1? #$separate-from-pid1? + #:bootstrap-scripts #$bootstrap-scripts + #:configure-flags #$configure-flags + #:make-flags #$make-flags + #:out-of-source? #$out-of-source? + #:tests? #$tests? + #:test-target #$test-target + #:parallel-build? #$parallel-build? + #:parallel-tests? #$parallel-tests? + #:patch-shebangs? #$patch-shebangs? + #:license-file-regexp #$license-file-regexp + #:strip-binaries? #$strip-binaries? + #:validate-runpath? #$validate-runpath? + #:make-dynamic-linker-cache? #$make-dynamic-linker-cache? + #:license-file-regexp #$license-file-regexp + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) + (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) (gexp->derivation name builder #:system system From patchwork Sun Feb 9 00:50:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38368 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 C867527BBE2; Sun, 9 Feb 2025 00:54:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 4BCED27BBE9 for ; Sun, 9 Feb 2025 00:54:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZS-00042h-AC; Sat, 08 Feb 2025 19:53:14 -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 1tgvZM-000404-Vs for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:11 -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 1tgvZM-0007mW-GT for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:08 -0500 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=AjrhpszZeZy0cvk4oT3dn2W0nBW5x3+hIG6280f60CM=; b=DmRvcu05qaMTaRONFCeEAkQfD/bEiUJ+RCmzdWqiXLvLjuHxVuNMFPDuZSI52RcoaBJh4B5zRPhQkfr66AttzXRlXtNrpDi+5rI/ylDMKboYnLo46HN2oQiLCWXJzJurg1rbBFNC4b6u1RFjKGBdW3ZicD3C70IpZ6SFjID+qYoBXCU4zD35hmm5Xpw9Wk46cuMQ4s0Tof0KvrlV01OS5rAQz3xjR+p8Twls4HKejhLmtxo4KyMwKbD/W2jPAPitC08i2QRYF3oChF0GJS5Wm4Lt2K/aV5oOzFb8+/sKmBAhyWwquuBste8FHFOWrnyUUZ+zRT1XB45o6RbzwvBH6A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZM-0007D7-AP for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 03/47] build-system: gnu: Redefine gnu-build and gnu-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:08 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235727275 (code B ref 68315); Sun, 09 Feb 2025 00:53:08 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:37 +0000 Received: from localhost ([127.0.0.1]:41980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYr-00075j-0P for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:37 -0500 Received: from 14.mo561.mail-out.ovh.net ([188.165.43.98]:36063) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYh-00073r-Ak for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:28 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.17.76]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Ld55fxz1FPG for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:25 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-hb5kh (unknown [10.111.174.17]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 489DE1FEA1; Sun, 9 Feb 2025 00:52:25 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-hb5kh with ESMTPSA id YcHqOEj8p2fJ0wIAUZ3VDg (envelope-from ); Sun, 09 Feb 2025 00:52:25 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003325fa492-adb0-4658-bd59-699c60a2c2aa, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:43 +0100 Message-ID: <20250209005219.25070-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18179061372439945954 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=AjrhpszZeZy0cvk4oT3dn2W0nBW5x3+hIG6280f60CM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062345; v=1; b=Yvm0twK/bboCnGxmKVmI/ONN5RAc+6tUoDBrG0A4XMLZ353q2cEovn9dGiG/LIYwaRTbc/ug YpY2OlDEXMpArBQKsjF5wQs9dz5VFQWL+o+BBiVN1TqyiLk0tj76rrzFxmjh2X3SPmd/HawRnuG CMJFHUO1QGtuCWHwthWDVhpdHwuRZhUKGP67VRruwMwdaKretQwNbE8qwh86DjX8daGxoqTqC8U jBkvHYt9aC3gmSb006ynSmSynhkedRZ9x6Zb1hwlDrL6CUVvoKWhWD1/6r5Hyx3D/n3t7wO/kik 6v0dDtCrCn+4utxGEWykgyYCSqMH/rYbP6h2hZLmw4q0g== 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/gnu.scm (gnu-build): Monadic procedure returns a gexp instead of a derivation. (gnu-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I6bf922ecd1474df104f959989db315d7ddc278b6 --- guix/build-system/gnu.scm | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index a71162c300..865301a92c 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -429,18 +429,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - ;; Note: Always pass #:graft? #f. Without it, ALLOWED-REFERENCES & - ;; co. would be interpreted as referring to grafted packages. - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) ;;; @@ -574,17 +564,8 @@ (define %outputs #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:modules imported-modules - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define gnu-build-system (build-system From patchwork Sun Feb 9 00:50:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38375 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 07C6927BBEA; Sun, 9 Feb 2025 00:54:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 9DA3727BBE2 for ; Sun, 9 Feb 2025 00:54:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZm-0004G8-5V; Sat, 08 Feb 2025 19:53:34 -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 1tgvZM-000401-2u for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53: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 1tgvZL-0007mR-QW for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:07 -0500 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=yo/AQm+cOY8EXl7YR9dU3fEOTa9FKlMm5XJ4dh+9yJA=; b=PyZEPGZperB8Q0o77NBhy71kMW9rejKyW3fBjrOT5f/7hUD1k4bS4nMwszSe0pQtMywhWPjn0gqBmEZELN5Vw6SZiDa1UdQxmJS2bwPRzOEGxABHPvudTRGHTeyqwT0vOxvXLvBub0XOiIaBiWbZnba49UT/Yy69doI9unOyYg8ja6YPKm+vQstpSvqSsZPK62l40F2QaCzz8PPnAFRfKhfaeqdRJZhO4cMaL5YURmOHrmkEM5hPho2m0w2G0uog8el/v7HiuWBKP89X0tqV+6A4ZamuoF883/7FNdigzgJC3Fbm2bPB0RJJWIJnJS118wnazbuU/pRMLGItjKYU8Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZL-0007Cs-Km for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 04/47] build-system: agda: Redefine agda-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:07 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235727266 (code B ref 68315); Sun, 09 Feb 2025 00:53:07 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:37 +0000 Received: from localhost ([127.0.0.1]:41976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYq-00075b-H2 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:36 -0500 Received: from 14.mo561.mail-out.ovh.net ([188.165.43.98]:41157) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYh-000745-Iz for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:28 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.17.76]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lf5D8Sz1RrP for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:26 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-ndsn5 (unknown [10.110.168.219]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6FCB81FD80; Sun, 9 Feb 2025 00:52:26 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-5b5ff79f4f-ndsn5 with ESMTPSA id YNZ6EUr8p2fTUQQAPedL/A (envelope-from ); Sun, 09 Feb 2025 00:52:26 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G0052d4a82b6-dd63-4da7-973f-176ffc2acbff, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:44 +0100 Message-ID: <20250209005219.25070-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18179342846757495522 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 35 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecufghrlhcuvffnffculdefhedmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=yo/AQm+cOY8EXl7YR9dU3fEOTa9FKlMm5XJ4dh+9yJA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062346; v=1; b=UUXaaaluCFOmaODggt19ySrD8I+lOMKi882Jt890bj3Rq8ZoWAD9rUG+yq5FvGzo3hLg6RB8 i3UudcLyhDdBumlrnmr9cf4bH8QjzsiiEitZAZD/4q3YB+x96U0resLkgEFSeZImFil+F8rGPBb vErrQh+wg5EMK2rI5VRXmtZPZorRFa136c2MtchvsggQsAHj6uKYNu4qMLQhTi2qsv8FdXVieUz dDA5E3rXTOgluiLa/Y9GOR0FY+xmxIH7JBYFvChhKIZUUW6dP23Zp/zoxJd7T3MFjdQrONhXcsz qvxsMgRBUEd74ufRQ4kJIhMD2TSRgzGrUqUG1j2ww/EDA== 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/agda.scm (agda-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I3c21a043a0687f4776d44297ed3dd4697a606b40 --- guix/build-system/agda.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/agda.scm b/guix/build-system/agda.scm index ec6ad860e0..b33737ffa2 100644 --- a/guix/build-system/agda.scm +++ b/guix/build-system/agda.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Josselin Poiret +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,11 +109,8 @@ (define builder #:plan '#$plan #:extra-files '#$extra-files)))) - (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 agda-build-system (build-system From patchwork Sun Feb 9 00:50:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38358 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 0F44727BBEE; Sun, 9 Feb 2025 00:53:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 0B11127BBE9 for ; Sun, 9 Feb 2025 00:53:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZS-00042i-AV; Sat, 08 Feb 2025 19:53:14 -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 1tgvZO-00040r-Kf for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:11 -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 1tgvZN-0007mb-Bm for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:10 -0500 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=VUezH1lkixs+Lfnizfmvkg4gEId3qCn0DmwwZxtOKNw=; b=ct6s0UmMPHoyXXWPwD73i6cChRHCg1QIAKMnEggfRJyiDVTXmjGGEbmCcHrCB3eGJ0HXI5lHDSkWhtrEsrljVbo4q2uf+2SmYbFn836Ui3oiBzd7n5AEiuJKjmaFEgvGQQDQZy3CrkHLmVfhtVP85PmPu6cSlMSplAymSUd1xqGDKzyoiq1GLlqoeFq9HYjnLHwlELeu8UP/Oi0UomB4CXXWHGO1DP0Fs07mbiT4dpYf77dAg5fi3CSQMe0aKJ8koJs9bMcNu4AsbzY2VyUoD6kOfSHc8xByV1paD/VTDBBqBgk4qkvg5sJj8g9NhWbOvj2D6naaymlG9vjLXTSiQQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZN-0007DO-4b for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 05/47] build-system: android-ndk: Redefine gnu-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:09 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235827281 (code B ref 68315); Sun, 09 Feb 2025 00:53:09 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:38 +0000 Received: from localhost ([127.0.0.1]:41982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYr-00075t-M2 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:38 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:32843) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYi-000747-LT for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:29 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.137]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lg5G1wz1chF for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:27 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-vplvf (unknown [10.108.54.10]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 829E51FD80; Sun, 9 Feb 2025 00:52:27 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-vplvf with ESMTPSA id DswLDkv8p2ePHwAAp69fzg (envelope-from ); Sun, 09 Feb 2025 00:52:27 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002669f2aed-4574-4c9d-a1b3-28d8a6c2ad29, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:45 +0100 Message-ID: <20250209005219.25070-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18179624322683757282 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=VUezH1lkixs+Lfnizfmvkg4gEId3qCn0DmwwZxtOKNw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062347; v=1; b=a6d2iObL1Z+Hflw6D7KqACebdLctBPb3HxIMvNJDHig6f0DeFuPdHdniQNgnJ60XHUohZr3C KhE/HJMIWNj2FvspiZT4UexdoZg/gQEvM/eS5hcx25rfyBPOd+rIJpUIolT3BuPlxTKZo6d/KQA lA5/Jv3fwqUrH+fJwmOwecJ7VuZTX0Hq1DJsM2r8Z0nVfH7IKf4WnX/D15JwlHvi3160IA6RV7Q J330OQwZBPKaD1X0FgpEE6Al1f/NZcZ37b20bwqRYXw6bLHi5qaLzXc8+5y4N9E4oaq8/2B1bpy 1UHbuW+Wt2+pemFVf9DPQb4kL++BnedadWhJtIJA+u+Ww== 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/android-ndk.scm (android-ndk-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: If1737d77ebccd418ad461c91aff170273855ed45 --- guix/build-system/android-ndk.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index b8cd56b871..66cd96c725 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,11 +74,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* (lower name #:key source inputs native-inputs outputs system target From patchwork Sun Feb 9 00:50:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38359 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 B111327BBE9; Sun, 9 Feb 2025 00:53:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 0C2AC27BBEA for ; Sun, 9 Feb 2025 00:53:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZR-00042g-VC; Sat, 08 Feb 2025 19:53:14 -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 1tgvZO-00040s-KK for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:11 -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 1tgvZN-0007md-R4 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:10 -0500 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=1GSU5QzIoce51IY7ReAWEhV0DoS4GZoJgub7vNTyyV8=; b=Q91RgyG9c1151tLw6SqkHNCjVxzzpCb/Ub6QWUN+uFCbObF/DjP7ETmDPV0HWGauH6f53TBGJFpz+ThjPZTxIJB21ZW8IquY4rZcBgoaUBSpmM0ftl5ounGKx7ncOem2/MHpgpXktK24YVhWsKkWzK3545AGr74f/Sp0q7Cc0lM/RXs6c96VYmKfH/dYf6+Z6EIe1vywQVwAmGXAcNaeIRDZQB2cs/KtnjdaTJmfxDTNRHZD/4+JQJiDG32FcjBz5FQOjhdJXre0u/bdIZZcMtfi6xLcyjwOLElwGEEtMjFcQ6s6FD6xORNfQS3idK2ioNNagGLv83xh60O5dbVBQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZN-0007Da-LI for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 06/47] build-system: ant: Redefine ant-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:09 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235927297 (code B ref 68315); Sun, 09 Feb 2025 00:53:09 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:39 +0000 Received: from localhost ([127.0.0.1]:41984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYs-000763-7V for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:38 -0500 Received: from 12.mo583.mail-out.ovh.net ([46.105.39.65]:37923) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYl-00074c-5m for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:32 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.203]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lj33x4z1Rgx for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:29 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-vplvf (unknown [10.111.174.181]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 03AB11FE9A; Sun, 9 Feb 2025 00:52:28 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-5b5ff79f4f-vplvf with ESMTPSA id JvArEkz8p2eSHwAAp69fzg (envelope-from ); Sun, 09 Feb 2025 00:52:28 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S0015d9f8354-eff8-4baf-b3ee-c465d83fbb7a, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:46 +0100 Message-ID: <20250209005219.25070-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18180187273898746594 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=1GSU5QzIoce51IY7ReAWEhV0DoS4GZoJgub7vNTyyV8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062349; v=1; b=OV2SVJ7M8q6+ZfYPU2xzO97Km9pKaGIi2TrGHS/AE/d+AgHsJMirFfovsImaFDWjfbm6nPWs BH/hjVx2ArXT87qazi9ZfIKxkhqvVtwPfboYuPWLXzRd14+hy1ZJtN1djFwx4bhkpxKRXDkFQ3N qsBBkevaqOU6EZKHD1gPEH0rg0vIiIISGnAtNYZ1ZBlpqMlJd15kw4P7f9/aGxT/up65whM3wbt AF3We4LPrdqi01EBF7qN2IBOuDo2hoFT+tcAloh2pv1h8BILcvwTKwVO2abLAfK/+GvZiiCK05o GPtrskUEaB1Kh+vELKnwD3gQQeVCfcSgx63FzLmP+Glsg== 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/ant.scm (ant-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I4f1152e29b938dbf37125bf156fb56b841011f06 --- guix/build-system/ant.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 9816cc061c..3ce919032f 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -144,11 +145,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 ant-build-system (build-system From patchwork Sun Feb 9 00:50:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38373 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 06C8E27BBED; Sun, 9 Feb 2025 00:54:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 459E827BBEA for ; Sun, 9 Feb 2025 00:54:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZU-00043F-HN; Sat, 08 Feb 2025 19:53: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 1tgvZO-00040t-Ta for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -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 1tgvZO-0007mu-KW for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:10 -0500 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=Aqb2Cxi6G3pKPU8bbilm5LQ9+Ul391wqt6ztF3/ONlQ=; b=mf0SBdv+ZBYpCn1rIzyz1FkPILX23qUVDYO3rv0jl1i1bLtuVH2XY0DWvX5GkD+p7qgiAvtoYA45LQ+xW09Dn+9oZu4njnuRqt0XpPEUfkgE2HCSz8CbBDHx40qZt1tXbPpCS6rdcF0JQOkC2uaLLBvdtBL04HjeMN1y9xuNhrq1u+N8i2iIQSRS5VvK9CBd+EUEo/rYhUH3cx+JYNekbOcnyHod7kOxxgPOF5OcmkpzzRYd5B7/bKS/BCMn468+bLaSENEDIC8Uri3lR7+YwCbCeoKVg9feR8Ozb7O8FkV5ppiPkyIEr50WROadTvjVISoyzNQf+RPY2bPpkMHC7g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZO-0007Dp-Ci for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 07/47] build-system: asdf: Redefine asdf-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:10 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235927311 (code B ref 68315); Sun, 09 Feb 2025 00:53:10 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:39 +0000 Received: from localhost ([127.0.0.1]:41990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYs-00076E-Ti for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:39 -0500 Received: from 2.mo581.mail-out.ovh.net ([87.98.143.68]:35095) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYm-00074l-3x for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:33 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.2.160]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lk3MvXz1Gld for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:30 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jtgr8 (unknown [10.110.118.244]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 20B111FD80; Sun, 9 Feb 2025 00:52:30 +0000 (UTC) Received: from ngraves.fr ([37.59.142.112]) by ghost-submission-5b5ff79f4f-jtgr8 with ESMTPSA id CpD5OU38p2c6hCcAmJ4t+A (envelope-from ); Sun, 09 Feb 2025 00:52:30 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-112S00681baf51f-6357-4a30-8dc0-dce7d1f39570, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:47 +0100 Message-ID: <20250209005219.25070-8-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18180468750012572386 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecufghrlhcuvffnffculddujedmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Aqb2Cxi6G3pKPU8bbilm5LQ9+Ul391wqt6ztF3/ONlQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062350; v=1; b=Yz8vnmaBRP8riDr5nMtKhKe7n/H7kJxiueApXWmiyoP8V9o0LmYt479+jOjDQORRm4cB9E2u 76ymY1CdYFlUDJXsRQ7gwVaa2BlMO3vyrtBe9fB1w8vhg1H4z2zr3lePPzgB3C61155U7eA8eJk DVL9fJ+bdG3LM7McsRxuciXe/29cc+KKP3IIsUAlC5PX5dn8GQjlyQl111K/kKbk8+dk7OPxrVB Kb9tMFInQVfIPJbzGs8cSZPLzPDmbw2IREiqr0XLUZ7Vf+xM97SpZQ+KPA4x8PJOMEP5inDEb+O 6yv0cTKK3I4vyb/D7VzWL+ptZ74l/ZO5NQ9QSuDSoT1aA== 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/asdf.scm (asdf-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ifdd57c4e5279d110ee7c670090b3ae4089703659 --- guix/build-system/asdf.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 26b5a5008a..c778bd36e2 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2022 Pierre Neidhardt +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -318,11 +319,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 asdf-build-system/sbcl (build-system From patchwork Sun Feb 9 00:50: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: 38361 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 D90A027BBEA; Sun, 9 Feb 2025 00:53:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 6983A27BBE2 for ; Sun, 9 Feb 2025 00:53:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZc-00047T-H0; Sat, 08 Feb 2025 19:53:24 -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 1tgvZQ-00041i-Hv for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -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 1tgvZP-0007n3-CL for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -0500 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=l2uiez+8coQoUvWElZMk88oD9mK0kTxGmMWo4Adt480=; b=kLX6MeUKjRc2VGzik/cx2hQuI89H00+AOPcilxCgfGZbFzxAz738fWaPNZEDU4vwwbfylvDmUHThW/1Sc5XmpbmaFn7DoT/FDwWqO3rnRGAW9Qtr/XQ/eT5L8w8iuEuzQiKavfe2H1Ws31D/N2QOdmV6uGtehMeHMkNWK+aJlEbCWEVbkivELnhRDvUAymKf2aiVOw6aNnlyUgcdlDYTObN8s5qOVbjzrg89Cm5ggx7Zghu/eW4Mdp0y+Fz20BQ6xnvKYMIQcP4YbdYcBGXhHnybcCTtsoIJlvV2S1pqFTacqdmukN7wT9CvXiAufHw4r/ENRsX8NG358T9ahIsd9g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZP-0007E6-6g for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 08/47] build-system: cargo: Redefine cargo-build and cargo-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53: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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906236127329 (code B ref 68315); Sun, 09 Feb 2025 00:53:11 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:41 +0000 Received: from localhost ([127.0.0.1]:41994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYt-00076S-KK for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:40 -0500 Received: from 1.mo560.mail-out.ovh.net ([46.105.63.121]:41017) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYn-00074p-2n for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:34 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.140.54]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Ll3mjvz1chM for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:31 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jzdpn (unknown [10.111.182.10]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1C9811FD4C; Sun, 9 Feb 2025 00:52:30 +0000 (UTC) Received: from ngraves.fr ([37.59.142.111]) by ghost-submission-5b5ff79f4f-jzdpn with ESMTPSA id 1eseLU78p2cSJAAAen9vRQ (envelope-from ); Sun, 09 Feb 2025 00:52:30 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-111S005b23a99a5-45c9-4315-9e3a-b5771145818c, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:48 +0100 Message-ID: <20250209005219.25070-9-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18180750223274009314 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddunecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=l2uiez+8coQoUvWElZMk88oD9mK0kTxGmMWo4Adt480=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062351; v=1; b=3q5kLc9lat3XSYcUXVmt+zKmuAFcxHBscJ3xg2sxJepJ235xZElgY44B9OczEwFDx2tRYhjt HAD1iBLI3xPB4SPdqgF/KbuignNkki4peETNpST62K7rIrW0ALhpA/UIzcERTQYPwDA8IhsORrm gC9vyHwafPOhAVWRFV0DOHBA6r1g4m+V9MMh1O8L1J1/EJzLZdNOPzjfm7wotqJAITB48in1NNI 5Te0qe1c7sbrmM+nOwR/oTnNxDjQUUh69NodUxBfS+fxBl0Xde3U6Zq7syHIWOG2ojGGea4tpaI nrI0pmllrm20QZt6et9Bj9Mjyszc1I+D5vKSrxvX2KxCw== 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/cargo.scm (cargo-build): Monadic procedure returns a gexp instead of a derivation. (cargo-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: If1151e9222170f2eb3a92d43debc61c696c2e72d --- guix/build-system/cargo.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 452f7f78d0..4d130ab706 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021, 2024 Efraim Flashner ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,11 +140,8 @@ (define builder (map search-path-specification->sexp search-paths)))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define* (cargo-cross-build name #:key @@ -205,14 +203,11 @@ (define builder (map search-path-specification->sexp search-paths)) #:native-search-paths '#$(sexp->gexp - (map search-path-specification->sexp - native-search-paths)))))) + (map search-path-specification->sexp + native-search-paths)))))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define (package-cargo-inputs p) (apply From patchwork Sun Feb 9 00:50:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38376 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 D93A227BBE2; Sun, 9 Feb 2025 00:54:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 165A127BBEA for ; Sun, 9 Feb 2025 00:54:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZe-00048y-7a; Sat, 08 Feb 2025 19:53:26 -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 1tgvZQ-00041j-Ji for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -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 1tgvZP-0007n7-RN for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -0500 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=zackkaBucq3udR0CWxG+lVY2P1c0fkuX7/Uk0d1yLAE=; b=mctnVfK7da7bWBVwm3vlQC5GnxVvyWASjSnDgyMu4gk0VkKio+1+gpIB2W8ubrh9vI/tPotCZrI8PvjWqsWs7tDdAn+C9ybwnKdQxlLjNCqAeb+k9gMCtPF+Zspj474Y7rrNU/dfo1Imdb0NBplsq9UB6xFXZ+E3KQJObMAd+BFTFvxdpRnDJe8FK6qplm0p5v3KCOxLEIM7eq6/QG8A5G6x44/wL58ExQ/zsptKuH4I0mBXGs2Aa0PU3X1eGTDYFLNGJ7QbihpNa/ahk4roOF+JJ4mfrbScZf2OcetHlVjW/ZPnHGxeIbdpN6WO1Q0y7QFcPPl2pujcWWmclhcuww==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZP-0007EH-LZ for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 09/47] build-system: chicken: Redefine chicken-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53: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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906236127347 (code B ref 68315); Sun, 09 Feb 2025 00:53:11 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:41 +0000 Received: from localhost ([127.0.0.1]:41998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvYu-00076k-O2 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:41 -0500 Received: from 19.mo550.mail-out.ovh.net ([178.32.97.206]:50689) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYn-00074w-Rq for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:34 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.25.249]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lm39z3z1W4F for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:32 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-6v7kd (unknown [10.111.182.10]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3B22B1FE77; Sun, 9 Feb 2025 00:52:32 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-6v7kd with ESMTPSA id K0RMOU/8p2dTfAMA7tIFRA (envelope-from ); Sun, 09 Feb 2025 00:52:32 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001ce6db7ef-04d8-4d0c-8cea-63b343ff946a, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:49 +0100 Message-ID: <20250209005219.25070-10-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18181031696720454370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecufghrlhcuvffnffculddujedmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=zackkaBucq3udR0CWxG+lVY2P1c0fkuX7/Uk0d1yLAE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062352; v=1; b=WYQmuuJ6Eyz8OVizUeHuoEpKtLC8rqEIuCGWypoGqtYQo/NLwAxNIYN5WwDQIJ9H6U5NJjUd I0fhz6XwZFUJgFKHnB74b6ViWPhj00F/bGOogL+f6IRcJt6ZI0HzJbjZD4cnPbHsoHBo72AxA2i +ykl+2X7Jm6nlszm/uQhQqz6cjm2f3gWA8sWWkxL7GPv0UUQrBvx3zDVi2Tl68t5tPGY3msBMCs 4TS/YQzOnMmh+WVBJhce4Nlk83tm973dKFJiK/opcf/9IIxgQ+XLwTZAklvcUgmJoeqUKhYuz+p qbafmMEfBNFzVfcd/aj3B0dxmFDN67KngV20LznUbOAog== 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/chicken.scm (chicken-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I6a837f198ac6c371b08f8690ff5bea68dbad2b54 --- guix/build-system/chicken.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm index e6fcfa7ee3..5c4a7f45bb 100644 --- a/guix/build-system/chicken.scm +++ b/guix/build-system/chicken.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,11 +114,8 @@ (define builder #:tests? #$tests? #: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 chicken-build-system (build-system From patchwork Sun Feb 9 00:50:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38366 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 78FA927BBE2; Sun, 9 Feb 2025 00:54:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 B03C927BBEC for ; Sun, 9 Feb 2025 00:54:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZa-00043j-4Z; Sat, 08 Feb 2025 19:53:22 -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 1tgvZQ-00041m-Ls for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -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 1tgvZQ-0007nF-Cw for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -0500 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=+CusKL0wTDvHsp01/q9fUjOFaTZzSx5+UGZri0539wU=; b=NCHteiPLKrZels06x1pN/HT30/YzkWFA4bcLFXWL34eAK36CMU/EjEREipO7Q7QmW7GNy0Du1IBuLJPfFA7lgP4Z3MOifLY+pDASuN0tRLc97h5hvINpJCVkfTNV988mOoxRSIIHgqnmTeXolDQSatVzroKmzvS8zfvqhPrxPlHRP7CBN7xvjPFkHSbUaknxApAb+38w4+g/CUdYPgKznjv5Tta3oQp3QFAAs6sqw/pItZMer8/aoV/wk8kf/mW8swq4Ro63P6DBIQn2U6Ku4BI0P+wnCpos4oZvdsXozX7oCYRAjRSgQYaKLZtTNvtKUhxhLI7mMVKXa+UfmGpIgg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZQ-0007EP-6T for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 10/47] build-system: clojure: Redefine clojure-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:12 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906237527470 (code B ref 68315); Sun, 09 Feb 2025 00:53:12 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:55 +0000 Received: from localhost ([127.0.0.1]:42034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZ8-00078z-K8 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:54 -0500 Received: from 16.mo584.mail-out.ovh.net ([188.165.55.104]:59309) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYo-000753-Uo for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:35 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.17.203]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Ln2XGCz1Rcv for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:33 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jtgr8 (unknown [10.110.118.174]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 196C91FDE8; Sun, 9 Feb 2025 00:52:33 +0000 (UTC) Received: from ngraves.fr ([37.59.142.114]) by ghost-submission-5b5ff79f4f-jtgr8 with ESMTPSA id bTNeOFD8p2dBhCcAmJ4t+A (envelope-from ); Sun, 09 Feb 2025 00:52:33 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S0081fa86d8e-fa69-4c6b-8648-63db90fa0dfc, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:50 +0100 Message-ID: <20250209005219.25070-11-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18181313171594732258 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduudegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=+CusKL0wTDvHsp01/q9fUjOFaTZzSx5+UGZri0539wU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062353; v=1; b=swlevJZnTjWbdmPiJ3JxjHRZ1V3s9Z//oSut/ddXz6SNds/PgfbW7Tfq5F4tps+NRePHW3E7 Fum2nT8EBUTHE2uGy7bgo42I+fKbl5CESvfRlVfjn0Kf2DngLlkn9jeqE+ebpIXdTYKaba+kzRW e0/m1gPpLN9TmJkxcACwGn03WO5I5BJaPQZDG6ZQE1useU++a4xlmhthoQm5cu9Q+54pm6F//6V mIWXvG97DdynsVkcST1EZDxZzNDgTn8Iv19pdZLjnZAHL8HKMBW5OV4uEY/S2Hd61pfLka6PQKY kPi2K/sWwI2O6A8zUJfeeTp+luAs1qg4WSSKWJN9NgMlA== 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/clojure.scm (clojure-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I5b5b552052cfffc45bc4d82871600b322eb23d85 --- guix/build-system/clojure.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index 037fcaf21d..cddcf8304e 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2020, 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,11 +170,8 @@ (define builder #:system #$system #: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 clojure-build-system (build-system From patchwork Sun Feb 9 00:50:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38380 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 3CAFC27BBE2; Sun, 9 Feb 2025 00:54:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 CD9DC27BBEA for ; Sun, 9 Feb 2025 00:54:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZg-0004AX-GX; Sat, 08 Feb 2025 19:53:28 -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 1tgvZS-00042j-DB for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -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 1tgvZR-0007nR-6v for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:14 -0500 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=73v+CDE8E6Xh4IT1AZQx4yxLTwPCIvQrMpoXkvruVmU=; b=ZROO4G1q0pAZO83gBD/8g2jxsYQZ6h76biqihyhLb4YxeZSpg/CEmUnwM10JgZvH9nImhXbxcav1hq5zpk5/9lSYU5LPpvF339ot8PHURKX6vqIgdCTQNfMjqfywIYPpfRxf0EJpSAJeg/Hp6jIaYkS40g+sBZXWdFZ2W2Cs8TeiIH4qAhh3E/ZVARFcjIWoocKuTOtdxdFSJC4I/BQRQQLlbNz8OVjabFtVVWL1Ha0PdoWivinXUbNSUSatmMStf3vZZpX8+jmx/P+04551h3TpRjnYxtihGizqLcJ3UgYxo12XZuPVrNHg+n9TZGQXwwsgelG4b5TYxGmQsnhprw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZR-0007Ee-0c for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 11/47] build-system: cmake: Redefine cmake-build and cmake-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:12 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906237527485 (code B ref 68315); Sun, 09 Feb 2025 00:53:12 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:55 +0000 Received: from localhost ([127.0.0.1]:42036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZ9-000791-1p for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:55 -0500 Received: from 12.mo583.mail-out.ovh.net ([46.105.39.65]:58253) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYp-00075A-5o for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:35 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.2.54]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lp27hyz1RjF for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:34 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-24xrx (unknown [10.110.113.149]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0AB591FDB0; Sun, 9 Feb 2025 00:52:33 +0000 (UTC) Received: from ngraves.fr ([37.59.142.111]) by ghost-submission-5b5ff79f4f-24xrx with ESMTPSA id vcc9MVH8p2cmoQIA511UXw (envelope-from ); Sun, 09 Feb 2025 00:52:33 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-111S005926df0b6-7cfe-4db6-9217-0c7a708a771e, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:51 +0100 Message-ID: <20250209005219.25070-12-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18181594646429885154 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddunecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=73v+CDE8E6Xh4IT1AZQx4yxLTwPCIvQrMpoXkvruVmU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062354; v=1; b=Gmr/+NSdFs9MlWV6sRh2ltnhDAZMdDqJic77N78Dx4vDmXEP6JSbfaGuG7LH/VDn72AqtGdf rXwEh9f/L7ECRh/+9e4AcA/sCJ1/0jZnTY5U9SC9CljwN7cAO06o6rhiCMQGyijD90EcH3wWZ68 HknxKtbBNfo47uwuoyMg9y90KTTxn3yjmCtFsO2tHonSj7ddypSnSup+O/SFazBrpmK7BIFmNJf UqQIqmdB7ppUr1MYBeSvEC7y1FiVYyjJQVxjINMLJl1oXTH5UWrHOjIkrnWtqMDqnUolh+IaogZ ht8HoJmEo1hWm64CziF1NF4G88RkSTd26Oq6FcqQ3AZMQ== 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/cmake.scm (cmake-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I0c3ceb08391a38c52521416093d2c4b2ae869165 --- guix/build-system/cmake.scm | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 9d757c0d06..2051f71f88 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,7 +130,7 @@ (define* (cmake-build name inputs disallowed-references) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -161,16 +162,8 @@ (define build #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) ;;; @@ -263,16 +256,8 @@ (define %outputs #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define cmake-build-system (build-system From patchwork Sun Feb 9 00:50:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38377 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 2C7C927BBEA; Sun, 9 Feb 2025 00:54:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 D2DCD27BBE2 for ; Sun, 9 Feb 2025 00:54:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZe-00048z-7V; Sat, 08 Feb 2025 19:53:26 -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 1tgvZS-00042k-EI for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -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 1tgvZS-0007nX-4L for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:14 -0500 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=drCrtQwyP6wHshjPLAAR2AAxQaE6ZLMNX5kzRk1rItY=; b=cPJSyC+aIMghap6I6Mlz4Se3KkSJnSFF9ZPsC6lP/UfYlsmgyJPyv/6m5Rw+hy+Y2DNF+u7JhmIeQifjhwUFC4ig3us8TEudQA/tU4vqjsM5QcjF180CtRmn4kIYRFexh+CM6lzoknN6hZFP/Q9tB1APYv/9fU3QBuqc3QqDZSwWLEcx7S+nRcuDe+JPN/B4n4kgPqC6ExL7niSws40KM//Pc51+EyAIQ1f+/hZtyrCa45hlM+GGiPg4EOLITnjZjCGjYP/mAqUHiNVnlPhXag6eIbs8AYJ61hxmQCgud9D6aSNoi3Q7wp/wmzdXPVxTsQk0jopbHXIS4LJrx50Umg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZR-0007Et-RZ for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 12/47] build-system: composer: Redefine composer-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:13 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906237627498 (code B ref 68315); Sun, 09 Feb 2025 00:53:13 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:56 +0000 Received: from localhost ([127.0.0.1]:42040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZ9-00079G-Ph for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:56 -0500 Received: from 6.mo576.mail-out.ovh.net ([46.105.50.107]:50377) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYq-00075L-Bt for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:38 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.25.249]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lp6Qx5z1r1t for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:34 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-89r4f (unknown [10.110.188.65]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B6BD31FE6D; Sun, 9 Feb 2025 00:52:34 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-5b5ff79f4f-89r4f with ESMTPSA id fH/lJVL8p2d8QQkAyjHCiA (envelope-from ); Sun, 09 Feb 2025 00:52:34 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G0036482d68f-4a98-4827-b310-75e1d7d8c357, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:52 +0100 Message-ID: <20250209005219.25070-13-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18181594647177061090 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=drCrtQwyP6wHshjPLAAR2AAxQaE6ZLMNX5kzRk1rItY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062355; v=1; b=zZwOT03UAB1ITgPGc3r1bm5Rcc2PVj2OwiIqzc8GErgh8FJkn06ZY1H76iyZ9LS6OxEzbcCF jELqtZZ9+poFr85lXOEgohnjIwzKI/9A0mLnt/SyUVUPtZvbHN8Q9ZttK/MidmXEBp4uaMOCd9g iIWlF7WwmfPVb+Hm8pNLxp2Z9mSdsxR6FmJnXEpD6ITHFiqHtc2so22Un2wEXFzvP2m4A7mic6T kTzoVve/yhbBgL51QsOi1H6uOY6fP0XDn3W9Py/80cTqXIfVNjOjBU28X9vK1oh3w+v6RAcShWV sMHah4nIyt5a1Zs/dUJj5S5cnBz4sPlS5TYWesfZfFUAQ== 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/composer.scm (composer-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ib7787a5116744e61e3d0afeac6d85f61c6b6c9c4 --- guix/build-system/composer.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/composer.scm b/guix/build-system/composer.scm index 48ad90f253..ceb2bf6880 100644 --- a/guix/build-system/composer.scm +++ b/guix/build-system/composer.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2023-2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ (define-module (guix build-system composer) #:use-module (guix store) + #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix derivations) #:use-module (guix search-paths) @@ -151,11 +153,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define composer-build-system (build-system From patchwork Sun Feb 9 00:50:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38381 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 DD00727BBEE; Sun, 9 Feb 2025 00:54:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 A2D7927BBEA for ; Sun, 9 Feb 2025 00:54:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZf-00049G-5y; Sat, 08 Feb 2025 19:53:27 -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 1tgvZT-00042n-Dn for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -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 1tgvZS-0007np-TK for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:14 -0500 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=PXiE79+O2qY5FknSjmjqwzVMnlccqyyM57HgUsRaq8Q=; b=YNfY8ADWypR1dupbgi9KbPvZa2jVaxoWner/Q416EG9Yj6Y52lgME7trhr5Ojsfp904hnuQfeNhknIu063TZpnMeaFQJLeOuGzzbP5Jkal5PEEwN3ljGFi8OwMCxvCEo78GQ4Nb6oPOqP7tG9zAX3k3shH8/+1Kz4XtaSXV3V0QwvmZvMSQSuwBfkxttA5zx+JTI3EsWwj/nGfWUw6aveKVG3l5+NvEULS8oa0ubv/UaF5mwkUpcFpBP6UBpsGirx/vvVqIbuKzxHzjzf39FcniWiTaAW7Xbut5iZcK5ah8Zrf0a6LT4uIkimlYoGC4gdtrSxz9jyck2UORz5c53bw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZS-0007FA-Ls for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:14 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 13/47] build-system: copy: Redefine copy-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53: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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906237727515 (code B ref 68315); Sun, 09 Feb 2025 00:53:14 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:57 +0000 Received: from localhost ([127.0.0.1]:42046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZA-00079Y-GC for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:57 -0500 Received: from 7.mo582.mail-out.ovh.net ([46.105.59.196]:59751) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYs-00075h-6R for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:39 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.140.54]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lr2Fylz1Lnq for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:36 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-pkwb4 (unknown [10.111.182.250]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B06381FDDB; Sun, 9 Feb 2025 00:52:35 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-5b5ff79f4f-pkwb4 with ESMTPSA id kItADFP8p2dNci0AY1eb0Q (envelope-from ); Sun, 09 Feb 2025 00:52:35 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S001e31c0c6a-10d3-4363-9694-306d2142ea0b, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:53 +0100 Message-ID: <20250209005219.25070-14-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18182157598873215714 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecufghrlhcuvffnffculddujedmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=PXiE79+O2qY5FknSjmjqwzVMnlccqyyM57HgUsRaq8Q=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062356; v=1; b=q2oS2WcXggNi5kwsBQeHzi3zA7V8ODMh5465rtE4O8jw1b5aZW9oWnn4z38hx+lePeplBptm Kl3b70Thaay6vMNrFyVXd2OwnOmWDQqU1Wra6HJ2xXYHdpezusjJ/PaWnT+UNmSF1mIHGlRlT5T 6eO5xyOLn9EcVZz7RIZIlU1s72hT1z6WyFC8o0ZUPG7eVxHKVYQWlN2EiYfbYfUVl5S25Yysw66 zdh/f+Jnfzc06Q+8M7Nqrhy9FOMuyBFsEPXAOah0xZM04U8vImaIpBHLg3dhWm40BxwSlh59rUX cl2Zou5YHUSvzpau+OhW5/LxzvxIXaXdWUlk/y8ih2sgA== 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/copy.scm (copy-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I96dfa099501796df007143db63a49e2adedbee92 --- guix/build-system/copy.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index 1f2937e0f1..ec0f3d9542 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2021, 2022 Ludovic Courtès ;;; Copyright © 2023 Jonathan Brielmaier +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,14 +127,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:substitutable? substitutable? - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define copy-build-system (build-system From patchwork Sun Feb 9 00:50:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38396 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 9CBDB27BBEB; Sun, 9 Feb 2025 00:55:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 692E427BBEA for ; Sun, 9 Feb 2025 00:55:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZf-0004AB-St; Sat, 08 Feb 2025 19:53:27 -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 1tgvZT-00042o-Lz for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -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 1tgvZT-0007nu-Dp for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:15 -0500 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=unnV6yg2kItVnnqJ0KFiTVyplcQyRGTMn3gAOkluTDA=; b=R6mvDPgpZKWbRozZTGo8dIuJHpbx0OHsPw7cu1REXaFx36rrUACeRJN0hg6WqrIeSYOilhg3VIVWra1I4+xvuysh9dedpMV1L1UbYhvL5TlKvf9vBDZ9YOe5R/teGqtYYcA3BGP3LRi/0nlTmvewC/EVNGmTmgb/ykb1tv+vnBZTBMS3X4y40q9Z5GejSBbtEfsALNg1R8DjKn9pKRRdFtaBU2/Ldr4Z+1HjYVWOU15fgwAY4ojDKIk0k2gWBk3o8m1sjWVOnXI9EuOCvkSd0TG6dNq/QdwPqHrghDEZf6zE/Lom5sa/uYDeeaaH6xlbikun8QqO5zDjiL78QnLN3g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZT-0007FN-8h for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 14/47] build-system: dub: Redefine dub-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:15 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906237827529 (code B ref 68315); Sun, 09 Feb 2025 00:53:15 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:58 +0000 Received: from localhost ([127.0.0.1]:42048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZB-00079l-9S for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:58 -0500 Received: from 19.mo583.mail-out.ovh.net ([46.105.35.78]:44515) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYs-00075q-N0 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:40 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.25.209]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Ls1rhnz1RjF for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:37 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-6gphg (unknown [10.110.96.89]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E53C21FD73; Sun, 9 Feb 2025 00:52:36 +0000 (UTC) Received: from ngraves.fr ([37.59.142.112]) by ghost-submission-5b5ff79f4f-6gphg with ESMTPSA id PlXqG1T8p2f2lwAAC31h2A (envelope-from ); Sun, 09 Feb 2025 00:52:36 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-112S006e1f18a6a-4c7d-4ece-bbea-0cc57ad1d11f, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:54 +0100 Message-ID: <20250209005219.25070-15-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18182439073697751778 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddvnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=unnV6yg2kItVnnqJ0KFiTVyplcQyRGTMn3gAOkluTDA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062357; v=1; b=qSh+JBDotshJFScewpQAQ8j0Pl0t/mlMczuH57LeHjVpEt00OPQ0nAidWcgk2uZIZqMNH0aL HCjbuFxUU4xriLfTGPjWKkFC/LLKwOpvaraa8/Ce05H61Thlod8BIN7L6b4qBpfklvt0pe5sMnJ Bf+wdgA7dpNSytLZl30Zr+5CNUZACFZ6kXXtLti2Zu1L/r4xRnGGsJrONWVwhLJVTqXVGTWgWeg u8zOa5NYZz1aw2lWT2ROV6QnKHRwuLTN4prHO8uU3eUmdUQMsdZaauoxGebTSc4f195FYCVANCQ hA6yJind6C9FZhY+hIwpcdoH9epqCTEe/CB4OV9h3iTSg== 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/dub.scm (dub-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I678a7287172157688b95cab00175e61852a99c58 --- guix/build-system/dub.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index 831a34af0d..170f247e5d 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,11 +94,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* (lower name #:key source inputs native-inputs outputs system target From patchwork Sun Feb 9 00:50:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38402 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 5FEB227BBE2; Sun, 9 Feb 2025 00:55:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 4CFD027BBF0 for ; Sun, 9 Feb 2025 00:55:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaD-0004XD-Jd; Sat, 08 Feb 2025 19:54:01 -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 1tgvZU-000430-5j for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -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 1tgvZT-0007nz-T3 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:15 -0500 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=w9rpfELU8T9xOjQulNW8Vi5x45k7ZsPe2xV8y0clCfw=; b=V9S0tR8usM8UoL1QbEnsQwNuqh9J1LOG7dRgeWk0lryQ7wbJCgCpT6z+3nsj+EVyr8YptZnxOPfYw0js3Nnh7sL+XL5uso7hGXDfHoHa5WCwtg3486meczucOYYa+/RbmKCnVyhW6TxIh1W5W9qKtiu8T2vmSQOKf4yLN20xW7RTPP5QbWK/M6ANUjeB0OXsu4auJn4ijQ0eyQcHdaMTPxQfyIVKtpuhaHQeB97kgf0qa86bQKwkt18Nt4k874M0SrFzZIZFtQGNb1Jekc8QO/KRiTBLduG9c9o47EHDWJ+i6LS1ZRqBxOUwC3M/91EjZoxOlZst7wZdy96OHANFVA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZT-0007FW-OK for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 15/47] build-system: dune: Redefine dune-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:15 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906237927544 (code B ref 68315); Sun, 09 Feb 2025 00:53:15 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:59 +0000 Received: from localhost ([127.0.0.1]:42052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZC-00079z-Ef for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:59 -0500 Received: from 1.mo560.mail-out.ovh.net ([46.105.63.121]:50389) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYt-000767-4R for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:40 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.17.203]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lt17r5z1chF for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:38 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-7b684 (unknown [10.110.188.251]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E88D21FDE8; Sun, 9 Feb 2025 00:52:37 +0000 (UTC) Received: from ngraves.fr ([37.59.142.104]) by ghost-submission-5b5ff79f4f-7b684 with ESMTPSA id mLUpMVX8p2fTuwEAkOveIw (envelope-from ); Sun, 09 Feb 2025 00:52:37 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-104R005e0e099e2-b4df-4a9e-98ee-6defdc8cccc1, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:55 +0100 Message-ID: <20250209005219.25070-16-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18182720549379171042 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdegnecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=w9rpfELU8T9xOjQulNW8Vi5x45k7ZsPe2xV8y0clCfw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062358; v=1; b=IwXTG9VfdKMhktS/PhaLxTIB98SuvceLaWoiot6ukvPz89NUYaktspeOo2xEt+/5TIFI7hOK PP1EU70+ExxnZ2NSaNvLY/tF5w6k31m+3Za/oBpUnNtv25PGt0tkKo2KqoA0XHoYz9qAyhYbGsi 3WOXkMPw5QmTMx9fRt9NOVYSyeyGgry0aamkEsCln0KqAcH3z4/CC96jK4Bevz39loRLGUua5nh u7sQ77K20r4C0oqk2UOBtgKrwwCCCcUSmv5bEjJZEZChN1DBq5HsMtHdsCcfDNP6aOsc2PbXtYE 7Fd0w9pNmZrky1KfkPCydxtUQAYY/WArvw3uMOcBOZsdQ== 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/dune.scm (dune-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I2a0a9a771afbe491538ed50aeb47b9fa4fd9341b --- guix/build-system/dune.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index c45f308349..990d94db0f 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2021, 2022 Ludovic Courtès ;;; Copyright © 2021 pukkamustard +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (guix build-system dune) #:use-module (guix store) + #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix search-paths) @@ -152,11 +154,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define dune-build-system (build-system From patchwork Sun Feb 9 00:50:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38367 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 8793327BBEE; Sun, 9 Feb 2025 00:54:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 4723F27BBE2 for ; Sun, 9 Feb 2025 00:54:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZw-0004H2-8I; Sat, 08 Feb 2025 19:53:45 -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 1tgvZV-00043n-1i for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:20 -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 1tgvZU-0007o9-Bl for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -0500 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=aUemQZat1duncZF6MgVuONjZkvDgdE4prbolywx2zv0=; b=ZwZmbw6UH1CxxptMZzJ9pVpalrJNNcvAQXa/bi61z2c9UXu84MxgZoS5w3GkfdBz36XiJrelR7ZDXtfYkD15vG6UjlXO875iYoEJUH5XMykPPOU9t9CEZ1dCMAYZNoXI7om9hp9n9MAn039Ptv0VWMqbVp78htA4B9DZK0KEqAMpJ/Lg5qjepWb7OGLa0agiN5T7LEY1YuoIZyP+iNjzWWjPYeNcuxCrgdAtzwvNKoV7Wg43pCbUc68IHRg33cDGBJ6E//STvbU79ifZY1zPUog0GN7tJ5uzqeTtSiU+Tr+NsYOOR65SZOmsB4/J6/OlEuo1tJh7ttSp/LM67XQEnQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZU-0007Fd-6k for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 16/47] build-system: elm: Redefine elm-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53: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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238027558 (code B ref 68315); Sun, 09 Feb 2025 00:53:16 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:00 +0000 Received: from localhost ([127.0.0.1]:42056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZD-0007AD-7E for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:59 -0500 Received: from 19.mo583.mail-out.ovh.net ([46.105.35.78]:38777) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYt-00076J-JU for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:40 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.140.39]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lt4gwGz1Rgx for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:38 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-x2vnp (unknown [10.110.168.127]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7C1031FD3F; Sun, 9 Feb 2025 00:52:38 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-x2vnp with ESMTPSA id UO+YF1b8p2fF/xUAP+2OBg (envelope-from ); Sun, 09 Feb 2025 00:52:38 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R00210243e30-b853-4bd8-b4a0-d8bbd6b791bc, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:56 +0100 Message-ID: <20250209005219.25070-17-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18182720545886626530 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=aUemQZat1duncZF6MgVuONjZkvDgdE4prbolywx2zv0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062358; v=1; b=DAECAoxM+CSoQvLUs0GjeeUk2ggw7BpJNWFuDDF2+FO6OwTR9XEESN/GuIbG3czG0IKwAqBi YimrJ2LxJj4Wh65Y04PYa3RbWJwGdSzvmQi+XUP8vyjPDHOv3KeYhkU3XmZfs0c3+aWADD+PQ5e PExXWnI+T9Id4uB5Dqz9JK66+YPQfsFDIpBj85aP6Dmth4xT+S/Obfw5loZSd7mlEm4wdO3b295 fd2kNX/C3MTOFji/zUhO8VzSlJc4BxzP4vCOMPdTmYRHLExg4fruIFkxkf8+kiIc/kCrl9BzsJT KHzRZMpbY2Kqhrpvroc3IHG8ws0gg90wim8Ujpu5jOsJw== 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/elm.scm (elm-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I9d45b254d5e8fdc337d075e7394e3354c9186ea6 --- guix/build-system/elm.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/elm.scm b/guix/build-system/elm.scm index 7405db3d98..aa842ca9c6 100644 --- a/guix/build-system/elm.scm +++ b/guix/build-system/elm.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Philip McGrath +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -193,11 +194,8 @@ (define builder (map search-path-specification->sexp 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 elm-build-system (build-system From patchwork Sun Feb 9 00:50:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38385 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 2A0F827BBEA; Sun, 9 Feb 2025 00:54:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 E06B027BBE2 for ; Sun, 9 Feb 2025 00:54:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgva5-0004OK-9A; Sat, 08 Feb 2025 19:53:53 -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 1tgvZY-00043r-53 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZU-0007oD-R0 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 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=DJZL6IUibZ70kcaNKM+rq1Tv5iXRVXKVsh/C4M4FIro=; b=S5hl42XLTvD1aNs65XFTreya52fHjMDbEYdYLnEn1GI4PDZilgazjnDfcTQmvAE4fxHZ2PpjpCDdZZGdT6iay3/O5/26DOGF9SMAIACP4iZN3WrqmB9h++IdJoCSEa0souGigxywh2PcxujyopS6nSSwi69gvTXVsY6Gzwwg7MiUSmC7Bd5KZxggnWBNKeHc5v/gKOsvR7p2AEqJVqZ2WF6Y2r9AqVgvSnR67KCTmzKSVriiR0fGdIMLSPebRAqgqyTNeEZJYSZBjbhVim2EWuaLoxIJVcUzM2e4IpjNRaebva7VLwud9SfMdX54fRUuSnz1SHiF0DbbRAe08h5Bnw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZU-0007Fl-LL for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 17/47] build-system: emacs: Redefine emacs-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53: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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238027568 (code B ref 68315); Sun, 09 Feb 2025 00:53:16 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:00 +0000 Received: from localhost ([127.0.0.1]:42060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZD-0007AR-Se for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:00 -0500 Received: from 6.mo550.mail-out.ovh.net ([46.105.43.205]:35915) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYv-00076a-6B for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:42 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.17.203]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lv50bzz1V3G for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:39 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-77ppr (unknown [10.110.164.123]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 63D3D1FD17; Sun, 9 Feb 2025 00:52:39 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-5b5ff79f4f-77ppr with ESMTPSA id oyImOFb8p2cbeicA54ZK/A (envelope-from ); Sun, 09 Feb 2025 00:52:39 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G003684a079b-d963-4fd1-a382-d3651718efbc, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:57 +0100 Message-ID: <20250209005219.25070-18-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18183002023899816674 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpeegnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=DJZL6IUibZ70kcaNKM+rq1Tv5iXRVXKVsh/C4M4FIro=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062359; v=1; b=5ON+UxEZaQac96pl4JL7Cn43ubLTd6/1GaQPUVuEu0eosXMrX5eiKeseXFwXLDRVfUm3MO6B 7oR56V0H2v8yaFd98vJzGs49CYk5GCGNQOMjdvh/0HMEV+F2Hw1OZ/kxGs5YJOQ3h/ubhChcOZK Kkv+uG0n9nBGNfvX/0zxzi9GsSeunCXBptte57qlg2MJzEe0A6uyHJEK2QfGLA31Qn6e5Vv780k iLZXfP6+fCrQPTy/KF6VIYfQYF9P80OQCzDgv80jgIhZXKgdK9aehMtkPx8bgB5oEl58KXbr3FG 27FotcS5kOr119xWmfuGyznkDsQNGnXnvi0XUmQ5JMGfg== 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/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 03273d738b..d0276f5cb8 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 From patchwork Sun Feb 9 00:50:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38390 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 8E14227BBEA; Sun, 9 Feb 2025 00:55:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 56EF227BBE2 for ; Sun, 9 Feb 2025 00:55:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZf-0004AC-Ti; Sat, 08 Feb 2025 19:53:27 -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 1tgvZY-00043s-56 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZV-0007oM-AY for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 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=KV+Vb+wBalj0E8VUdSa/5xd27tafw7g9XQhA9kCC2Mg=; b=Tjyzii2NjSSTGpkZ/TgoD/ziEEel78gz3ucqutfJA28+fMiicyPvo0T+E6SeD9XusjTQl9D78fa5KNfzp3ZwjFItheP5ciz/YbdoCJj7JdYPE+0OSLtWmV0YTZc8+suQ4boMeeIkO29SJTvArPdbXV2JfgDr/JAeSi/aYfjmfLkfTLMBrI9GyHKKNZSuKoIhnIX/CIhpVhZcefrh+ItueUj2XMY3/rnNW4B8Cl1Ryx0yGGpt2+eOCJ0qAtQENE7orym6lm1bBqKEFj7ykHvBm6va25B8nZS/CkOiY0wp54YB4X50JYalan2qmaIhKhOIvur/jasddjoKFGaG5Mvupw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZV-0007Fs-4Q for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:17 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 18/47] build-system: font: Redefine font-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:17 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238127580 (code B ref 68315); Sun, 09 Feb 2025 00:53:17 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:01 +0000 Received: from localhost ([127.0.0.1]:42062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZE-0007Ab-Fd for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:01 -0500 Received: from 14.mo581.mail-out.ovh.net ([178.33.251.19]:33993) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYw-00076t-7t for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:43 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.9.127]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lw4GLZz1Hbf for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:40 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-55k8x (unknown [10.110.188.251]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 62ECA1FE77; Sun, 9 Feb 2025 00:52:40 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-5b5ff79f4f-55k8x with ESMTPSA id 4lcbD1j8p2cH8xgAdEC7mw (envelope-from ); Sun, 09 Feb 2025 00:52:40 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-100R0033112fcc2-5506-456c-9b97-cc080670f3ad, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:58 +0100 Message-ID: <20250209005219.25070-19-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18183283495674700514 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutddtnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=KV+Vb+wBalj0E8VUdSa/5xd27tafw7g9XQhA9kCC2Mg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062360; v=1; b=J2Nug/qAO42gWLoelBdgYjrGVpe6tgwXqiXCjwsfbLI9qtD41HTyUhWM9tbHa5MNJvide0Sy TJED494cPMUyWeenyX6/xX53eCl7ebIvppPX1zkJImL2SVjEuyYFHyRNeVhm00vTLUr5nrN/cog +2W/Cf9yJ9+yQk0yJBap3MMoymW6Whg6mcOoFdRXmW2gxLXRQgN+NR374DtJn4SLobsh5BpSKHk 5E5RbD9x16GldPamNkdNMjRYwdbTOQboh/GOK7a4sBCdSkGekcZuF0IZpyEUmxNLtmDI4Fdny0S uLbDmR1n4x/n2X9iii7T/sviK+REZ9ky2+aKPxJn+UeEg== 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/font.scm (font-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I2a4838fc616e4ef8819b292d6842961284288867 --- guix/build-system/font.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index a4eeca00ca..1cab4a4e9d 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2022 Arun Isaac +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,13 +109,8 @@ (define builder search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define font-build-system (build-system From patchwork Sun Feb 9 00:50:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38398 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 6438D27BBE2; Sun, 9 Feb 2025 00:55:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 36CD827BBE9 for ; Sun, 9 Feb 2025 00:55:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZf-00049o-Hy; Sat, 08 Feb 2025 19:53:27 -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 1tgvZY-00043x-6z for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZV-0007oN-OC for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 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=u9D9amdieEAaVYF7rD3lM9KgMIAuwc4aZCw2rdSrlds=; b=qKETo9SUx0F9JXK1e2lgQ5eOcrbdV3RdYIrGelj5AQYd6AksIilL1Dl8xGC0F/g9a99xRdgZzRodXVyKwFdllSIuHcvhjRsBy5nAUmKj+ly3nN/LBr+LOgCOurnrZqqKINQcDyHpnZ5inSn2qtiKyhKfrmTbkYhwZIsBcLfEWL10Qzip31QnWkqczzRLjrWRBFK75wtOVcg+5y+rNdg1wJTeN9f1z7BvqdU805WgEuP/6LIRj166BrNXeWxCznkyzxpF43moAwy0edttuK02llQ1YZO5O/28Ir8krdbzZh0qW8cNtzlpwW1gVm5iolspwQwc124/1vIclrlnRp7ETw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZV-0007Fz-Iq for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:17 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 19/47] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:17 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238227604 (code B ref 68315); Sun, 09 Feb 2025 00:53:17 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:02 +0000 Received: from localhost ([127.0.0.1]:42068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZF-0007An-3F for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:01 -0500 Received: from 17.mo561.mail-out.ovh.net ([87.98.178.58]:55519) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYw-000773-MK for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:43 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.148.110]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lx1fK4z1RrP for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:41 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-bdv8c (unknown [10.110.188.109]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0F65E1FD2C; Sun, 9 Feb 2025 00:52:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-bdv8c with ESMTPSA id a76xN1j8p2d98wYAzJwxPA (envelope-from ); Sun, 09 Feb 2025 00:52:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001aeea56d2-e86a-4259-9616-7ee646e5e926, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:59 +0100 Message-ID: <20250209005219.25070-20-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18183564972719071970 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=u9D9amdieEAaVYF7rD3lM9KgMIAuwc4aZCw2rdSrlds=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062361; v=1; b=Pmhy1aA7yla/7poD03HGivojIwtyVzoyZ6Up6ST99FONE3XITu88/X6Rn3Czgd3cYTv9ql/H UQo9auRxKLwqJtyR1vfbVg2zK4tyx9BHEP4flS6/v15QQxg/Ylohp0FfplWdrNKfRoV6gBX9Et2 K0iR/f1/4humdjT3ssiBnJQubnATNKhZjOSTOAiIHvCveE/8u8MwEcI9ANtABBpvp7XpYcwM5tH c7dUlwjSwZYKVFLlXwNFrkC2jFSLdQUky9kwSOCMb1QNoD6VhVYs7u76zxBzjdEgoZ1QWZbskED UiyAAPK/1JdNJxES6cF/08X6yEE1+QlSlr+T5aRWOoUUQ== 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/glib-or-gtk.scm (glib-or-gtk-cross-build): Use with-imported-modules around the glib-or-gtk-cross-build builder gexp. Change-Id: I8eaa032ffc0a3f8dbf02c96a4ecee85475c32111 --- guix/build-system/glib-or-gtk.scm | 89 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 5d026ec5ab..e1cc83c012 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -224,55 +224,55 @@ (define* (glib-or-gtk-cross-build name disallowed-references) "Cross-build SOURCE with INPUTS. See GNU-BUILD for more details." (define builder - #~(begin - (use-modules #$@(sexp->gexp modules)) + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) - (define %build-host-inputs - #+(input-tuples->gexp build-inputs)) + (define %build-host-inputs + #+(input-tuples->gexp build-inputs)) - (define %build-target-inputs - (append #$(input-tuples->gexp host-inputs) - #+(input-tuples->gexp target-inputs))) + (define %build-target-inputs + (append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs))) - (define %build-inputs - (append %build-host-inputs %build-target-inputs)) + (define %build-inputs + (append %build-host-inputs %build-target-inputs)) - (define %outputs - #$(outputs->gexp outputs)) - - (glib-or-gtk-build #:source #+source - #:system #$system - #:build #$build - #:target #$target - #:outputs %outputs - #:inputs %build-target-inputs - #:native-inputs %build-host-inputs - #:search-paths '#$(sexp->gexp - (map search-path-specification->sexp - search-paths)) - #:native-search-paths '#$(sexp->gexp - (map search-path-specification->sexp - native-search-paths)) - #:phases #$(if (pair? phases) - (sexp->gexp phases) - phases) - #:glib-or-gtk-wrap-excluded-outputs - #$glib-or-gtk-wrap-excluded-outputs - #:configure-flags #$configure-flags - #:make-flags #$make-flags - #:out-of-source? #$out-of-source? - #:tests? #$tests? - #:test-target #$test-target - #:parallel-build? #$parallel-build? - #:parallel-tests? #$parallel-tests? - #:validate-runpath? #$validate-runpath? - #:make-dynamic-linker-cache? #$make-dynamic-linker-cache? - #:patch-shebangs? #$patch-shebangs? - #:strip-binaries? #$strip-binaries? - #:strip-flags #$strip-flags - #:strip-directories - #$strip-directories))) + (define %outputs + #$(outputs->gexp outputs)) + (glib-or-gtk-build #:source #+source + #:system #$system + #:build #$build + #:target #$target + #:outputs %outputs + #:inputs %build-target-inputs + #:native-inputs %build-host-inputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:native-search-paths '#$(sexp->gexp + (map search-path-specification->sexp + native-search-paths)) + #:phases #$(if (pair? phases) + (sexp->gexp phases) + phases) + #:glib-or-gtk-wrap-excluded-outputs + #$glib-or-gtk-wrap-excluded-outputs + #:configure-flags #$configure-flags + #:make-flags #$make-flags + #:out-of-source? #$out-of-source? + #:tests? #$tests? + #:test-target #$test-target + #:parallel-build? #$parallel-build? + #:parallel-tests? #$parallel-tests? + #:validate-runpath? #$validate-runpath? + #:make-dynamic-linker-cache? #$make-dynamic-linker-cache? + #:patch-shebangs? #$patch-shebangs? + #:strip-binaries? #$strip-binaries? + #:strip-flags #$strip-flags + #:strip-directories + #$strip-directories)))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) @@ -280,7 +280,6 @@ (define %outputs #:system system #:target target #:graft? #f - #:modules imported-modules #:allowed-references allowed-references #:disallowed-references disallowed-references #:guile-for-build guile))) From patchwork Sun Feb 9 00:51:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38378 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 0710827BBEA; Sun, 9 Feb 2025 00:54:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 D347527BBE9 for ; Sun, 9 Feb 2025 00:54:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgva8-0004TK-Ty; Sat, 08 Feb 2025 19:53:57 -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 1tgvZY-00043t-5G for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZW-0007oO-8I for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 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=dgJKkis3nWHH7QQG3I6x7NGBN1ZeNj4R4y+F7SU015c=; b=qtX2O/M8wu3a5IUgCi6W30+yCvz67K52OXqsEgfQ/152STM8J+fPmuhzjdGMfWeuBuFiNuoqYy3XI7DjGNNcTELlzx+EgWfdWtnwPG6OlgJU267YH038pJ4UxZ5WNlotwdoLSxwyOPoEX+1yUQnMBejD48HwmfrmFhWnJyBn17HaWR9wdtN/Z+a9ckAo9jj1yVUmrxGX9U2ecHE5sOuVtJGYwROiUgL88nfSZHZXX3r+YrYhK2U1r9Z59wPzZxKTHRo7+42xJtxGRdT+M7ya4C578xhwoBbiheyxx1D9wUA3Yxtz2TzfKcswrNS6qDPZ7GdExNhElA3hapYYLNYMUw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZW-0007G7-1T for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 20/47] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:18 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238327617 (code B ref 68315); Sun, 09 Feb 2025 00:53:18 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:03 +0000 Received: from localhost ([127.0.0.1]:42070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZF-0007B8-W8 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:02 -0500 Received: from 20.mo581.mail-out.ovh.net ([46.105.49.208]:58287) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYx-00077E-En for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:44 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.139.198]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lx6kPhz1H2Z for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:41 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-lnwvp (unknown [10.110.168.127]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id ADED51FD1B; Sun, 9 Feb 2025 00:52:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-lnwvp with ESMTPSA id q3qrIln8p2d6PQkAhcl1zA (envelope-from ); Sun, 09 Feb 2025 00:52:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003063264e0-8f75-4197-9697-c5a86414a010, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:00 +0100 Message-ID: <20250209005219.25070-21-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18183564974500012770 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=dgJKkis3nWHH7QQG3I6x7NGBN1ZeNj4R4y+F7SU015c=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062362; v=1; b=u6KbcaxD60/Qb5mtf2p6x8Ikzjm8fPpAkRcL+LTxyYeucy9bgvlL6URgBW6KbCnUxyhm3DpK dnh2AU3ZOCJbP8BPWPQPC1pqST4XOjQYophuaNYop2QYXIX1FSQA66pJwx94KsGN0HeZ0Jnk2J/ +iwRkoQQBewvMylTp4rseCXNGhszhDN8weVgoNDXkR3iIleYuya6d3o+U98Njhz7AZaWZMSi2Cg bKumzrTjErRQir7lLhUWN4CS3Uk2HNPUltigZpyWDaQxTfdhOj9PjXwr8siBH6pNHws6hknqG8s O3FPG+qSkPvR80FNAv0D5iV05h3bf4dfniKLjT9koH/Nw== 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/glib-or-gtk.scm (glib-or-gtk-build): Monadic procedure returns a gexp instead of a derivation. (glib-or-gtk-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I24f722e47f3ecce7132a7647b5689f6c10abbfd6 --- guix/build-system/glib-or-gtk.scm | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index e1cc83c012..170a9e9dd0 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,7 +149,7 @@ (define* (glib-or-gtk-build name inputs allowed-references disallowed-references) "Build SOURCE with INPUTS. See GNU-BUILD for more details." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -180,16 +181,8 @@ (define build #:strip-directories #$strip-directories))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (glib-or-gtk-cross-build name #:key @@ -274,15 +267,8 @@ (define %outputs #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define glib-or-gtk-build-system (build-system From patchwork Sun Feb 9 00:51:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38384 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 8A15C27BBEB; Sun, 9 Feb 2025 00:54:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 EBAF327BBEA for ; Sun, 9 Feb 2025 00:54:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZg-0004Ab-JV; Sat, 08 Feb 2025 19:53:28 -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 1tgvZY-00043u-5j for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZX-0007oS-5S for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 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=cTVlmf5dhzPaV8iz5ZlS5Capdqf8m3Ir94bJMfGNzW4=; b=OoIYfZK2GWRzdrBqTj/5PhonEriB1SCbOEnF5N4Bq2OUvWa8qRK6xric1+7qYXFRpdkCJK3jHKDvDjbHcGLgr4vwP6SZ/S3hBwWN8WefF1fDLjE7+AkMnTqO1M7PhpoTOe6MFx58LWbbdCL6WLuWabIjB4NNXfJjki10TxRZ44F/2FuIjBMMWJfm+bWEBb2CTWmy/7kDbLG3bd8SXNcxKtw4jwF/FBRPPv49EwGepFTf3Q6p7RnvdKkxCce7vz70uJFZDC0ieAvwWX2KTMTH+OVURfi2H3jiXIJQGmW8t79At9h83La5GYsnXmyDoORg5oaVPmmUm3JQH0oDerpipw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZX-0007GM-0z for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 21/47] build-system: go: Redefine go-build and go-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:18 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238527662 (code B ref 68315); Sun, 09 Feb 2025 00:53:18 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:05 +0000 Received: from localhost ([127.0.0.1]:42081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZI-0007Bm-1K for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:04 -0500 Received: from 3.mo575.mail-out.ovh.net ([46.105.58.60]:39461) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYy-00077L-SI for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:45 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.2.54]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lz0w4cz1l8K for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:42 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-vplvf (unknown [10.108.42.28]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A985C1FD5F; Sun, 9 Feb 2025 00:52:42 +0000 (UTC) Received: from ngraves.fr ([37.59.142.113]) by ghost-submission-5b5ff79f4f-vplvf with ESMTPSA id nL6TFVr8p2ezHwAAp69fzg (envelope-from ); Sun, 09 Feb 2025 00:52:42 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-113S007ef6b5de2-30e7-4226-b9b3-da5f7e402230, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:01 +0100 Message-ID: <20250209005219.25070-22-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18183846449146290914 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduudefnecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=cTVlmf5dhzPaV8iz5ZlS5Capdqf8m3Ir94bJMfGNzW4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062363; v=1; b=vgJosBTNnbKisja5Hl+/dWHYiwnIrJwZi6V6/6WEZ1mqxQ6hCtPOHlxaGq5Io0QdzGJczie5 22MrOU9uRLBj6KtN5zOBNiFUcd/IQV3T6/qXvpaA07FKG0vUanZUbzvNRDNG8BBGc8XiP/wljB/ QoprYj/5a2qC3KLVNs62sBnhllvKbTCzTfS7G3D1HTlAWa1vdP6FnUXVPqZmxhCHDLBQqI+/l8r gGnH2+4id7f/fKL0aKG6PrebhdHaHuKBnBIswukscX4ns/WvkS0wTVIUavV8dnXPFldX6OygtKv uPtP7qB0RH949fDHRzr+mT/ASHkxWj4ULuUsiY85xFeag== 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/go.scm (go-build): Monadic procedure returns a gexp instead of a derivation. (go-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I5222463ee5c37f4cd987ac60b1cf2c46eeb79008 --- guix/build-system/go.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 863177c59e..133b62d7d3 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2024 Christina O'Donnell ;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Sharlatan Hellseher +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -249,11 +250,8 @@ (define builder #:allow-go-reference? #$allow-go-reference? #: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* (go-cross-build name #:key @@ -293,7 +291,7 @@ (define %build-host-inputs (define %build-target-inputs (append #$(input-tuples->gexp host-inputs) - #+(input-tuples->gexp target-inputs))) + #+(input-tuples->gexp target-inputs))) (define %build-inputs (append %build-host-inputs %build-target-inputs)) @@ -329,14 +327,8 @@ (define %outputs #:allow-go-reference? #$allow-go-reference? #:inputs %build-inputs)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define go-build-system (build-system From patchwork Sun Feb 9 00:51:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38370 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 1FA6D27BBEA; Sun, 9 Feb 2025 00:54:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 9798E27BBE2 for ; Sun, 9 Feb 2025 00:54:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZg-0004AG-Av; Sat, 08 Feb 2025 19:53:28 -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 1tgvZY-00043w-6T for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZW-0007oP-NO for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 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=NN7DNRkRsu9+sWPfHPmDLf20O1FOZ+sjYxdcfycCMVs=; b=W6l3QWUX/eaMu4WELO4pP4Xv+PKHiz0gCJowVhNi8fXa0zTcZ3du6261KC/HZv2j5EUBbMrDl6pa3imSzJbFNGLwewL3UUKE4gvtrzZwURjO2i7SGZKPSecRnvh1N/4Hjh2bLWEFLu9LOk08nj7a7bz9qJz97iyHGgP9ywx4Qug8DVt6fNYcGlhzgSb4NLXj6LtRrkpDF13hDPg/yFheejYrAT9fnKjJapfrdv1jaSPOvB6T1459fF/RGNoiPwyjm06PO9lyWCnI2bXZ4I7lgvnxsWQ5iZLpm6lMGh7YPfFZd0Mx1bOEx+0YkyTHL1u3Szl5pscy8hRjKkstvtS6+g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZW-0007GE-Hy for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 22/47] build-system: guile: Redefine guile-build and guile-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:18 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238427641 (code B ref 68315); Sun, 09 Feb 2025 00:53:18 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:04 +0000 Received: from localhost ([127.0.0.1]:42076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZH-0007BN-2Y for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:03 -0500 Received: from 5.mo583.mail-out.ovh.net ([87.98.173.103]:41887) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvYz-00077R-14 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:45 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.9.127]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lz4Fjwz1Rj7 for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:43 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-dt8w7 (unknown [10.110.164.49]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5B6671FD2F; Sun, 9 Feb 2025 00:52:43 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-5b5ff79f4f-dt8w7 with ESMTPSA id U+MkEFv8p2f//hUAsiJe4A (envelope-from ); Sun, 09 Feb 2025 00:52:43 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004656ad52a-6228-49db-8c18-e150220e2ad5, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:02 +0100 Message-ID: <20250209005219.25070-23-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18184127920784007906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=NN7DNRkRsu9+sWPfHPmDLf20O1FOZ+sjYxdcfycCMVs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062363; v=1; b=brpIUh9/pvlRups/D3FocfgnUzjo9qcaFOfd6D6JhGYP/7erJvRTNBnltWWMfwN/0yHmHkCd Lf/8rWnR30L+Nb7Zca1Hc3x2eNlKgYj1rLqD/giwHV4B9D08QUA3FoAPaWEHLzubl2i5RdS0kDx y9q+ylXNB6jihw5tLRCsKUm47Z1/0LdNmHcU5Vn60AxP4AZhCZyhXxYgS5LH4RPb0Auc5xi+3qo PkJ48H+GqRTzRlQ62PyuKzlPyHbC4K87UFSe8XVLJ+vJ7iBLs8yK/lkiC8JW5tinN6EaBKCKACJ RkhEtH8wJXVm3Bz4ZBJFYsTmzaG2+RI8zxxUNxtrJREKA== 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/guile.scm (guile-build): Monadic procedure returns a gexp instead of a derivation. (guile-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I60f2d7707f064ef6a678e8e47e21309d0eb545ef --- guix/build-system/guile.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index ee59bb15f2..06bd68aad3 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018-2019, 2021-2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -109,14 +110,8 @@ (define builder #:search-paths '#$(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* (guile-cross-build name #:key @@ -170,14 +165,8 @@ (define %outputs #:make-dynamic-linker-cache? #f ;cross-compiling #:phases #$phases)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define guile-build-system (build-system From patchwork Sun Feb 9 00:51:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38389 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 3769327BBE2; Sun, 9 Feb 2025 00:55:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 88D5027BBE9 for ; Sun, 9 Feb 2025 00:55:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZf-00049C-4j; Sat, 08 Feb 2025 19:53:27 -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 1tgvZY-00043v-5x for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZX-0007oT-Jx for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 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=k0Ar5056kddzX5pERO0WV7Lq5dcuNcCsVtJeTIaR6KE=; b=KV4hNcc016f9DHP6dwfrIGS6qTNjwZjEkP6RWIdSTUoYuaiBu/Ll2hy1V+/DA32fYTeLuIo8aaxSNJbUi4/vKI372PZGG2Y0tOYJxOBZVBSxqfbkkKKdwuT+/MAD0RLZy4F840xTYAByJRlPyM6lXo3uGSR+FGd/R5g5mORgtYdiagv8t4F3Iwktkpqo8WNUGtklqvOOvQLvxqYDi2U+n4bkPsD83067i7UIj6QaUa+SVVFuh3d6gtaK8mghntXpCRBQzFj63Zdu2P4m8JoO+I5H/FBfs2POR+fKZG2XZkVnHOw9HEyN8PgssUoPSF44KmEKUjpY5wNr8IfHTFWFPw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZX-0007GT-Em for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 23/47] build-system: haskell: Redefine haskell-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:19 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238627677 (code B ref 68315); Sun, 09 Feb 2025 00:53:19 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:06 +0000 Received: from localhost ([127.0.0.1]:42085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZJ-0007C6-18 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:05 -0500 Received: from 3.mo550.mail-out.ovh.net ([46.105.60.232]:60075) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ0-00077Y-Ge for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:47 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.139.198]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M052xVz1V3G for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:44 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jzdpn (unknown [10.111.174.62]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6B4BB1FD10; Sun, 9 Feb 2025 00:52:44 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-jzdpn with ESMTPSA id sclfCVz8p2crJAAAen9vRQ (envelope-from ); Sun, 09 Feb 2025 00:52:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0022e94ce0f-ad00-4797-b6a9-4c3b48b581f0, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:03 +0100 Message-ID: <20250209005219.25070-24-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18184409396604429026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecufghrlhcuvffnffculddujedmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=k0Ar5056kddzX5pERO0WV7Lq5dcuNcCsVtJeTIaR6KE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062364; v=1; b=2axjYfg8ji9OcPfoX3T1Nrh80f+UpfnsogWcOc+pM81sCKWV4uaMexlJlda73nrB20LLPUeR f5T6kJrCQIo5Y/OcSZknWvbB9t8KgrXjMtkLGOoXjxAKRqwFA9ANGzU10U0ImiBlbWvgQy+Nhtz Nft4Q3TJGqkP1fU+u0ZbnYuDkDLH33Gk9BNkV/wjO/mLwcSnIURszjQpGaX83+xgaghoL/o7Duv bZX5EcTCJKIbA6Am2Wy61T9LKaM2ewxoRnBk5/xi6bsgh2FlItpYUCRGS0OBlklCN0Zzz1oMulR tU1tdPdQ7hYVsueQKG/U83OdUUxn5BBtlH2vUFHQ1IIaw== 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/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 b0019dd014..f734584cf5 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 From patchwork Sun Feb 9 00:51:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38363 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 D848827BBE2; Sun, 9 Feb 2025 00:54:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 A0B5727BBEA for ; Sun, 9 Feb 2025 00:54:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZw-0004H3-8D; Sat, 08 Feb 2025 19:53:45 -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 1tgvZY-000440-DS for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZY-0007op-44 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:20 -0500 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=L8Me5nzn1DqLb5R82iubcDptKYLEDUnvnVHLHgUS1wc=; b=cUXKlYOs7ImZPDVRZAD5Q6gMQLDBX3eIZ5KQl7Dc+xuNwyV4Yd9DyzJL1CeIXGUNQ2y2HPYjYz4Vrj5hy/X2RUyFYXESFDzEf+cF790qcZFBruqsrWs51douKoQ6zp2jWNC/dWSRUhI4kr2yVP6kXvwyQUzsLPRBdsvBucoK/LFZ02i4Sf+goHva0xMxscNjfNtuX8ZPJW+TMaWteXRGXbc+EHcTDB6BWm1i9Tdk0kVk98sEkrbCUTVlqTVDBS7AzKeWg5ar+dydtn9RSq1+bhfk2oxQLRrBUYuBzHTechDGTdPnhFIIOcjiTdj5tHlIuLEom9sVKx+j8P7TMjJRxg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZX-0007Ga-TP for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 24/47] build-system: julia: Redefine julia-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:19 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238727703 (code B ref 68315); Sun, 09 Feb 2025 00:53:19 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:07 +0000 Received: from localhost ([127.0.0.1]:42092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZK-0007CM-3d for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:07 -0500 Received: from 3.mo584.mail-out.ovh.net ([46.105.57.129]:56021) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ0-00077a-Mx for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:47 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.139.198]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M120d4z1RZy for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:45 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-qg899 (unknown [10.110.188.17]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2023E1FE73; Sun, 9 Feb 2025 00:52:45 +0000 (UTC) Received: from ngraves.fr ([37.59.142.104]) by ghost-submission-5b5ff79f4f-qg899 with ESMTPSA id 6Q9dAV38p2c8NhUArsN5Pw (envelope-from ); Sun, 09 Feb 2025 00:52:45 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-104R005bec4e628-ebbd-4200-921e-4388306ab47f, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:04 +0100 Message-ID: <20250209005219.25070-25-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18184690870538527458 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdegnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=L8Me5nzn1DqLb5R82iubcDptKYLEDUnvnVHLHgUS1wc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062365; v=1; b=bv6a5lqbLWvs2bu/UPCrkby1912VL7LotKmCgZX0o0rWNALXONXpIvrDl5ScQGuvj9LdVbK8 pCWoAIjRA+zoxZQq3/sXzkcvbCc5saQoxaJ5qDJGlgrYNxraffOmx0cqRX5HkuOVvcQ29ssdq0m l4r/PooXPL8MY4YJ+SA74C94cfFTCHX171eTo0smS8w4UBK5H9tOmRLWfHgGZIJ5kH2MLnf0PHq oaX3nZXBzblLLbUe4/LFxkZsKSxy8bcTZH/9jApVdgyBZlI5lM6JAXObFg6F8b++IeWQYnQ7yR5 fpF6DXVbPZ+FhZ2wKowERkSZqK72tDMjlW9F1633Va8zw== 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/julia.scm (julia-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I34303f6cc1423e60f3aa8f66409ca0563e9876cb --- guix/build-system/julia.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index e098749683..57c403f4d0 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021, 2022 Simon Tournier ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -111,11 +112,8 @@ (define builder #:julia-package-uuid #$julia-package-uuid #:julia-package-dependencies #$julia-package-dependencies)))) - (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 julia-build-system (build-system From patchwork Sun Feb 9 00:51:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38383 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 26B9627BBED; Sun, 9 Feb 2025 00:54:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 A77FE27BBEB for ; Sun, 9 Feb 2025 00:54:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZh-0004Au-7x; Sat, 08 Feb 2025 19:53:29 -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 1tgvZY-000443-OZ for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZY-0007p1-GY for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:20 -0500 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=6FbjrpreFrVoU0HlnTySSveJwPP+N28ZjMGmj9Wgd2k=; b=bNmVpEFmIf2rFRfeJAFCeVbAtPtvlqOkY6LyUTR6es5y7jj1u4wNMuBzZfmfBc6rBTALNp1o2qed7QEaDV1DOKpPv/O/KDEhEszF1hwj45j9MU0l7HhIaU2e1jIQR2dJPVAWZxJ1d8GEtNtDlNnG3yAXOZu3c4UidUY6Z+yeVWMYL8MPJWJIHh0MhbNv8yjCBOXngfwht0PNIYLe3yFoUeuWc5ZCBl7cac4JfOiAY81VVmu+g+Uur4OneUdvHBCnzcb/JjQveoRO4fq3+11Fu4UqpJ7kZjc0oZnTTBxbfkQkYc83Ch31VLlDD/4akXkdfJxEbQ9jFyq4ZzzNeC0aeg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZY-0007Gi-CE for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:20 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 25/47] build-system: linux-module: Redefine linux-module-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:20 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238827717 (code B ref 68315); Sun, 09 Feb 2025 00:53:20 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:08 +0000 Received: from localhost ([127.0.0.1]:42095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZL-0007Cm-7H for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:07 -0500 Received: from 5.mo561.mail-out.ovh.net ([87.98.178.36]:49317) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ1-00077l-7m for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:48 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.9.127]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M15w5Rz1FPG for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:45 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-zs5nj (unknown [10.110.188.17]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9EA361FD28; Sun, 9 Feb 2025 00:52:45 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-5b5ff79f4f-zs5nj with ESMTPSA id v+CvIF38p2cTrwkAC20P7Q (envelope-from ); Sun, 09 Feb 2025 00:52:45 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002837a2f7b-767f-47f4-8e60-18f05fc5f2ee, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:05 +0100 Message-ID: <20250209005219.25070-26-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18184690873826075362 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=6FbjrpreFrVoU0HlnTySSveJwPP+N28ZjMGmj9Wgd2k=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062366; v=1; b=jgTrwG01vs/aT0+Mhkt90dk25bRW93Ak90u3g/Bu23qR0NmRhtxZ6qMu1Fc1RD24wy37BvHQ AhUXDm6wRjBwogZ6m7nK7N39u0LbtxBiHqkbJ8dMomQ4qnbknOTQw4uV42gYgdExrgW9BLMhd41 ew9eOJ4VZyEjz6NZqL7c6W657/TyyNA2VycbmoXRZXdEZdRNpa2laUnqrp/UICIapkytXOWRJ0+ uBR7Uhe4O5rBFKwPH9AcjXoUccHeW4KYwLOxWamMcFOcfRTnVLr7tUBgCaZ7HFKUcNRG+8o6btN m1ll6mLT5dXEHLVSLGI0wKczJwpLyT8R8EXi+AwDi0ouQ== 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/linux-module.scm (linux-module-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I289c0c77a219445ae0c21f1a9709a67063b38f55 --- guix/build-system/linux-module.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index d8ebef60d0..a0d213abd5 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,12 +191,8 @@ (define builder #:parallel-build? #$parallel-build? #: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 - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define* (linux-module-build-cross name @@ -250,12 +247,8 @@ (define %build-target-inputs #:phases #$phases #:tests? #$tests?)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define linux-module-build-system (build-system From patchwork Sun Feb 9 00:51:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38374 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 9262227BBE9; Sun, 9 Feb 2025 00:54:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 D035427BBEB for ; Sun, 9 Feb 2025 00:54:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZh-0004Bq-MZ; Sat, 08 Feb 2025 19:53:29 -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 1tgvZZ-00044j-9b for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZZ-0007p6-0p for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:21 -0500 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=guarJfl7Bcf0PfBcPjvHNNLeSNwngry7DMydIKpGQNI=; b=UqdbsbXIVB/VOdfmdCgLVGM7fNngyDm8cfl07vHU/vV3jHJzzHk6KGLq2ssCRoNDiZ6cd3pt+PU6zrMpi9OaJDaOLVcDbo0cHghiDcTwTHHJIJxo3kDF/kCRgg1HptC/wCeIzIail9F9uws7+EgUase6INNSBjQ85RhpGBeYdrdNX7LNC54i8KZ8fTusUEwNc1KNyP8F81Ekr6qaG68OFIrEwK2lppOQyhhT/Fr7VFXneKn1MsQFgbsnLRk3q8SaSf1cETbEctVSadlV7Z66MeXJ240ycOTjYt/bv0YJFkaLZHwh569rj5sQt4tOmoeffCISSxaIgyLhNcNuTH3IJQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZY-0007Gp-R1 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:20 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 26/47] build-system: maven: Redefine maven-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:20 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238827731 (code B ref 68315); Sun, 09 Feb 2025 00:53:20 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:08 +0000 Received: from localhost ([127.0.0.1]:42098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZL-0007D0-Uk for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:08 -0500 Received: from 7.mo583.mail-out.ovh.net ([178.32.124.100]:48115) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ1-00077p-TL for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:49 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.176.101]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M23r6Fz1RjF for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:46 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-x2vnp (unknown [10.110.178.240]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 52C1E1FD3F; Sun, 9 Feb 2025 00:52:46 +0000 (UTC) Received: from ngraves.fr ([37.59.142.114]) by ghost-submission-5b5ff79f4f-x2vnp with ESMTPSA id rB4UDV78p2fU/xUAP+2OBg (envelope-from ); Sun, 09 Feb 2025 00:52:46 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S0085674575a-2be7-4f9f-9d72-56ff99f9fd2a, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:06 +0100 Message-ID: <20250209005219.25070-27-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18184972348974162658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduudegnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=guarJfl7Bcf0PfBcPjvHNNLeSNwngry7DMydIKpGQNI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062366; v=1; b=TKN41QveuaWgD6VyniTthtFiMBspR/1TViOIUeJzjwr5enE7Wo4p5gF0xcgnGrLmKS8HzGic xah8fs+afkStiZTEkfjQbK5IJ+kk9oBP10khWxkOl28k/jnNExCsVFgOWURbdt5KqjaS4wbrykJ anm8ANCKzc45GZs1g3VUxnpT12+SCmaHq3MFVsVfb/yyLRoanZb+xNGyaCoUGzsRcBW/P6W6/7j AtLck/miSz2yLMo/dN7hOPBBeJiEb9pcZf+qAmeeZfoPlw7kGQVe9ISHDLbxi71AAIx8RWP4nyf izbuZM+BtmoBh0KNR/N6yQtpv6zxX1TX5aCc6ENPTxkdg== 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/maven.scm (maven-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ieb96bcdb1c654371279bd7295ea69e2dfad71175 --- guix/build-system/maven.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 03e4e96b89..270fceb350 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2021, 2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -185,11 +186,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (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 maven-build-system (build-system From patchwork Sun Feb 9 00:51:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38362 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 E137227BBEE; Sun, 9 Feb 2025 00:54:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 680E327BBE2 for ; Sun, 9 Feb 2025 00:54:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgva4-0004NI-R9; Sat, 08 Feb 2025 19:53:52 -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 1tgvZa-00044y-6y for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZZ-0007pT-UF for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:21 -0500 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=swb5ixhQhSyY69GJp546q6wMQZFdcG1XfhzxushTa1Q=; b=B2xO8dz5OUil0Mfiv/xnqK4X5mO5Rb6gCM+5PP46Qgjv+REcsozhwuhzuJ089B0hXQq7AvKWfFC6Ow4p+HY3lxC+7WSsiXfNrHb4SR/4crh37R9fYSrzZqfouEK+tOMDD3xPSn8OsrdJloGnRsIUmrL+tFNXsF3lTZ9tfrTFWykcsuFGjSr/0PRKSiCMDFLbFebjXMEmAqHm+SwbNihp8BjQ9cEVCQVbwwqfZ0y7D7qcXqhbCsSIKzBtVWuWka7aiAaqnA2cX0KG8FvmmEFp26o2JmRZ15tmmR78/J6HfrhgNcxtsSIcJcR8NqvyINJeP/SAoKv3BBWnVPmIh2SJWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZZ-0007H4-PH for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 27/47] build-system: meson: Redefine meson-build and meson-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:21 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906239027761 (code B ref 68315); Sun, 09 Feb 2025 00:53:21 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:10 +0000 Received: from localhost ([127.0.0.1]:42103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZN-0007DT-4p for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:09 -0500 Received: from 20.mo584.mail-out.ovh.net ([46.105.33.73]:48519) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ2-00077r-Q0 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:50 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.9.127]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M32YN3z1Rdt for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:47 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jzdpn (unknown [10.108.42.203]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 273A11FD5F; Sun, 9 Feb 2025 00:52:47 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-jzdpn with ESMTPSA id Q5TFNl78p2cyJAAAen9vRQ (envelope-from ); Sun, 09 Feb 2025 00:52:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R0017e36dc0b-bd40-46b7-bc2d-97e75b3dfed0, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:07 +0100 Message-ID: <20250209005219.25070-28-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18185253822147453666 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=swb5ixhQhSyY69GJp546q6wMQZFdcG1XfhzxushTa1Q=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062367; v=1; b=vapTHPvm8evFSG31TIsWZ4aLO0N06HAjfwSRd4My7L92YLWBAUo+GORooCyeTPgO5y3bLUe5 llC6NWhgmbEkjHetFvWAzFFprXxdwhAjlFyThH26fRGs2PCnECAJ1AFTvVVzWHbIz90sim56zcw LP7wJGPIy+SHJkneQorEY39BwfbK5peaiou9+8PNLz4Z5MK66McXSvnNLe3T3Apd7IqdLTKr7c5 8DR1gr4daEbH29zif83xXcYf8RXdPfUDb4goec1Yyz0DVlAOdKGrxR9VYudsihmUhHs/UoFT0Xp k9tLWl6Jnn2Y3/0RMoSY0tMWmEyo01SXki3Qp/Sxv5xNg== 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/meson.scm (meson-build): Monadic procedure returns a gexp instead of a derivation. (meson-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Id801e757463080dbeedc05a43bd0b2ae23fae4c7 --- guix/build-system/meson.scm | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 5eeeb59e65..585a3515c1 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021-2022, 2024 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -254,16 +255,8 @@ (define build-phases #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories)))))) - (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? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (meson-cross-build name #:key @@ -370,16 +363,8 @@ (define build-phases #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define meson-build-system (build-system From patchwork Sun Feb 9 00:51:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38369 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 74F5927BBE2; Sun, 9 Feb 2025 00:54:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 5D84227BBEC for ; Sun, 9 Feb 2025 00:54:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgva4-0004NJ-RN; Sat, 08 Feb 2025 19:53:53 -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 1tgvZZ-00044m-O1 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -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 1tgvZZ-0007pK-FQ for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:21 -0500 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=U/wJO4mpQNL5axb3Ym0BwYkdPwwVnLb1fODiTj8BLZs=; b=TLXSSrS7acl10iL6vihFdZUl8OMs+lCreQ3e6k9A+eZ1Sm6MjDYM+AWTjb6ByYYnAXJRYB9/IHTLCDNuT+S2oHctXffrKGxw44i41FSfhNsZd29W+T4p1wREP4kRq644AzaL0DXQaSlSuxZ6Ao+nokwKtjnNBS8JnHEfmvq1ZaLjqAde60ObfFZOQGLZa27vj20Ynjr10LzW0g4ft/oXaGbLNNu7a+2FKEOUItsRAndQbvHIF6P9Fi/kfATIiiuRqOk6LYS+jnrc501h6lVCQ8Frt+k95IgGe4KLtP5RED/K4Xz1di7e6P5t6KZEe0YIChTDy0csVsJCCnT1kBE8mg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZZ-0007Gx-AY for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 28/47] build-system: minify: Redefine minify-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:21 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906238927740 (code B ref 68315); Sun, 09 Feb 2025 00:53:21 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:09 +0000 Received: from localhost ([127.0.0.1]:42101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZM-0007DE-HK for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:08 -0500 Received: from 10.mo576.mail-out.ovh.net ([46.105.73.241]:49345) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ3-000784-4d for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:49 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.176.101]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M41zG9z1rjc for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:48 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jzdpn (unknown [10.111.174.62]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 03A441FE01; Sun, 9 Feb 2025 00:52:47 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-5b5ff79f4f-jzdpn with ESMTPSA id 9Vh7LV/8p2c1JAAAen9vRQ (envelope-from ); Sun, 09 Feb 2025 00:52:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G005e49e5576-c125-40d4-ae09-a07a0fe5c174, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:08 +0100 Message-ID: <20250209005219.25070-29-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18185535296549282530 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeimgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=U/wJO4mpQNL5axb3Ym0BwYkdPwwVnLb1fODiTj8BLZs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062368; v=1; b=LMjArNCEWgKg32xgWjnw9ylgvP/I3r3BqsNN0QQY1sVd7a4YNTwxHP2PdaH4JqBeReQl4X4T 284eyInXT7JKItQAQOZU1VR9DHcAbONCTOjWJra/hlGxvndDeGaq856sp7H7UOQarGnPxC/QNo2 r2XaS+c7pseN/I8UUiiPhuH5T53ZDBxODa7ZpD8r71UDDztnAVjSF10FPK6FC9Z0U7KZfSmCVLq WwxyrmvyVAaautr6VfQmof69MhhT3BxZ1OFiSzRuyTKJLtqyDV/D4yKSfnz7pLCYeTZQSI+H0V1 IpEYvd+p/WnWY2b/6tqAtS6t1c8S64rAJ9bFngpaE1OMQ== 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/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 98c6e75980..56590f6819 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 From patchwork Sun Feb 9 00:51:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38393 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 E946F27BBEA; Sun, 9 Feb 2025 00:55:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 AD97327BBE2 for ; Sun, 9 Feb 2025 00:55:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZi-0004Cc-8c; Sat, 08 Feb 2025 19:53:30 -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 1tgvZb-00047k-LT for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -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 1tgvZa-0007pZ-Dd for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -0500 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=T+i9mPPy6L7iOOCHk2Te3BG0AXNbs4o473Pi52AJ6jw=; b=o8M7FkJorpQZvoPDXqBtsG/3YmcNMSl23Wabsm5IrTmY7hN53UL5FlXU2rCCy+oOuSAbPxRZbOa0htJoHAEApqsj5ciIWXnEmo1tn+gGEI5QIwVSN02/mWNZO+QXjC11RcfpJSWdQmCAbVb1HWgNXolcLyYrm7mzrhXUqxD/N82gunW562CBWH5RwvR/AQXkiXRSA34CjBoLNem8UCZx0eW4DDAdPPuFM/ztVuWnQebsyiRYLS63fTXBDu7enfrZW9AZYYptpO440kFm/XPzSzBBMBggB1ag3JXx4Lp85DnbIps8CG+c9sAKWEaFzllfJbkibKPPygDl09EL5dEVDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZa-0007HE-8r for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 29/47] build-system: mix: Redefine mix-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53: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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906239027775 (code B ref 68315); Sun, 09 Feb 2025 00:53:22 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:10 +0000 Received: from localhost ([127.0.0.1]:42107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZN-0007Dh-Sg for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:10 -0500 Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:36733) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ4-00078I-U9 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:51 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.176.101]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M500TVz1VBf for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:48 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-rq4j6 (unknown [10.108.54.81]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id CAACD1FD28; Sun, 9 Feb 2025 00:52:48 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-rq4j6 with ESMTPSA id zC00ImD8p2csJAAA3hGPtA (envelope-from ); Sun, 09 Feb 2025 00:52:48 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002bf835b89-1ff8-4a85-ac0a-6362dc3e39cb, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:09 +0100 Message-ID: <20250209005219.25070-30-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18185535298210357986 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpeeinecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=T+i9mPPy6L7iOOCHk2Te3BG0AXNbs4o473Pi52AJ6jw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062369; v=1; b=OY5iBKWI/SOdbHoOWF7QaioRJkdzXEWMkz+goXJO0DdwKJDkum8BgEiLiwwSgVnUy5J/EzRY rNaCwFd38EXgAG5RfXrQxikUb0PFyxDfBL7RMFRmNgRt1/t79A/e5m5Ngs75lms+sp+z0Tbf1vj ScM2oD4PTJYkVgfEN0JurjJT5vQwL1Aii+Sm+VFkmmSu3F0XHCLvFogUnsn+Z9HFaSRpxTYCR5b MtBSNrL60MK5j4X3qt9EcWmyTVFvFg/uNxusyztL7YL4GsUUV9Vm8wnC/lASUKOWXaFvvQIe5n4 Gcb/LzCsY2nsroiXqjRhe1lvZx0NoEni/FnyW1UcDDuMw== 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/mix.scm (mix-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8a31c048d1458ece0f906023763b4585502f7710 --- guix/build-system/mix.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/guix/build-system/mix.scm b/guix/build-system/mix.scm index 4a3ba9fb60..6de09f587f 100644 --- a/guix/build-system/mix.scm +++ b/guix/build-system/mix.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Pierre-Henry Fröhring +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,15 +126,8 @@ (define builder #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system - #:graft? #f))) - (gexp->derivation name - builder - #:system system - #:graft? #f ;consistent with 'gnu-build' - #:target #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (lower name #:key From patchwork Sun Feb 9 00:51:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38394 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 1331027BBE2; Sun, 9 Feb 2025 00:55:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 CB99A27BBEA for ; Sun, 9 Feb 2025 00:55:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZf-00049t-Hh; Sat, 08 Feb 2025 19:53:27 -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 1tgvZb-00047l-LS for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -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 1tgvZa-0007pa-SU for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -0500 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=4i+jHxcybAZ36/AdfaezMMnYie9PAROSnvI2ZY9DT0o=; b=uE32hEiUI7qhIr8MTVf0QTJ1x+pttY20y6Ug702lCVqQ4jOhIKM/3FebhnM1zF9AVd7S0bJv7LBTSW94tAma8OuZwo7tP7ZTjr9UBtHejIkMO5dorDvVf5nQ99JDnDYMAnDirifPjlTou+F1C9credCmDbs/35lbEwG9D2hboVPZ+BoXDgnYZRQxlQ6gTyz23qGvtkBVrRGu+FBGieLMECKoc/RnpKhbiEYBHpEQ2wP8ESw5aulAuloZDyenwo0hQohcKZ0ubpg0gAZSJuzVFroMZxWJAozLaKrnEK2R+fepV5pnOW2avsUzJShHPiNTS3qqpPaJ0AAAoTugGug+KA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZa-0007HL-Nf for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 30/47] build-system: node: Redefine node-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53: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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906239127784 (code B ref 68315); Sun, 09 Feb 2025 00:53:22 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:11 +0000 Received: from localhost ([127.0.0.1]:42109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZO-0007Dt-Ga for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:11 -0500 Received: from 15.mo581.mail-out.ovh.net ([87.98.180.21]:39703) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ5-00078P-G3 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:52 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.9.217]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M5604wz1Hsc for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:49 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-txzl7 (unknown [10.110.168.82]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 93BD61FDC3; Sun, 9 Feb 2025 00:52:49 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-txzl7 with ESMTPSA id BqzPG2H8p2cg9AYAj9v/lg (envelope-from ); Sun, 09 Feb 2025 00:52:49 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002ea22f805-24db-4375-8a92-94b50ebedf72, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:10 +0100 Message-ID: <20250209005219.25070-31-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18185816770822791906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=4i+jHxcybAZ36/AdfaezMMnYie9PAROSnvI2ZY9DT0o=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062370; v=1; b=4Qkf4BalRljjXtiOBUvxGmUh790Ss0lDBHn3gd9d4zgP/Pn1Fpg35+JvGjMljb3+Qn4ghYtH OmoSwSj82FUEmLV6/SDU8xGvRZduuj00C9tb8NNf5d8lvtBXU4qhaAFb/dIm3e7eJDVqapXuPlS lb9vICfho/g8x3hdCondwyVMOMLERo1gcewKFJgtCgeKoE0OgWkWwdAzTCZyBNc+oIkSQeEv/KT juq4whC/mST39vDjYPue7Zg8doBaU035fGAX9fQayRiu5w97wlZ6q6eyr7AiREczwas++xM0XLs +/iWvV4GR2K/3RdbzeOhiJYGMh5tC12M4zKahl9a+L3mw== 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/node.scm (node-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I507547e474c379c0f66dde15abad73787953e5e6 --- guix/build-system/node.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 57fe5f6030..5116bc4a42 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2021 Philip McGrath +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,11 +109,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 node-build-system (build-system From patchwork Sun Feb 9 00:51:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38371 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 3148F27BBEA; Sun, 9 Feb 2025 00:54:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 DEA3E27BBE2 for ; Sun, 9 Feb 2025 00:54:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaV-0004hs-IG; Sat, 08 Feb 2025 19:54:19 -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 1tgvZb-00047m-Ov for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -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 1tgvZb-0007pu-Fu for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:23 -0500 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=UYbDL8n87osf+4NVurnrblEC/I3x2O0d+TdKqHncIRk=; b=hKLATLYsRvbDuo7qsduR6ML8Dlls3oSPexos+WDU01UQI4ZPc0GX0box9SIg2PcBeM029i8w1ogsGTIBAMAW2KX6oLNVxpAPCEfkcml/d6eVdwpYxGIW6DEEOVqnAQbSqd513w6VrS9Gi8Yh+3ZptMruRoPIFcqzm8iWFwUPu/QVOQflEO7jHvSS9AAIbCsQl16Kmwj0qZLDXW9B4xU44dKArQTb5C1elgQm3qlbmST2uLrL0RGPvM9BNC3pchXbmHrhdGlHC1K4cET8fjviSkSwNziEpflfveTOgsTCeM8jwdx4PTfUoH7zR4O9KkA8ZsOsX1RkfEEBdgeH+vJQtA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZb-0007HU-9D for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 31/47] build-system: ocaml: Redefine ocaml-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:23 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906239227813 (code B ref 68315); Sun, 09 Feb 2025 00:53:23 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:12 +0000 Received: from localhost ([127.0.0.1]:42114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZQ-0007ER-6w for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:12 -0500 Received: from 9.mo581.mail-out.ovh.net ([46.105.60.248]:35409) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ6-00078W-2S for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:53 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.140.35]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M65Klcz1Hr0 for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:50 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-sr2rx (unknown [10.111.182.244]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7D3811FD4C; Sun, 9 Feb 2025 00:52:50 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-5b5ff79f4f-sr2rx with ESMTPSA id Wtc5D2L8p2fLFgwA0iJdug (envelope-from ); Sun, 09 Feb 2025 00:52:50 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G00291d4c63e-5b72-4f89-97d7-130ed5480cea, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:11 +0100 Message-ID: <20250209005219.25070-32-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18186098246836806370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudegleefkeehudegvdeiffelkeegffeihfekjeduleevueeuhfehveetgfehtdehnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekudgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=UYbDL8n87osf+4NVurnrblEC/I3x2O0d+TdKqHncIRk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062370; v=1; b=HdEj+xUXaz+2ahUU0fw4eWZ4lPleGOpf2lDyqUXqDnFPorR1wMzY4bUkzdO5q9bSzIKwGhIK bmoYwOQwZYPIOGtEoEOXkvuXqe5YhC4JdDRf31iJ0PHP8bgUD2+8nnv3Ov3UwIWZLighDpYpSWX 49QZL20oijCn6QKuOizd6ootP2WbLbRsUw6U82Ru+zRR2P/5fVmof7dveCl6Tc7kvwZQJ3rLPKQ BhV3r5bNb9eErZMP6DJgal5qHU2sxCWJRynLqDrx6AbvnrOsDqPAHASNLtOnl/rgL67fCGu1HYJ K4H87GaLert7PVhN9LJWLCyOTAWCqCwUvJR4cfnQ1TznA== 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/ocaml.scm (ocaml-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ib525ddc1df03b33b95a433dd2add79405f611f94 --- guix/build-system/ocaml.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 2f2e6dd62e..cd4c877048 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2021-2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system ocaml) #:use-module (guix store) + #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix search-paths) @@ -305,11 +307,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define ocaml-build-system (build-system From patchwork Sun Feb 9 00:51:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38399 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 1812B27BBEA; Sun, 9 Feb 2025 00:55:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 9E1FD27BBE2 for ; Sun, 9 Feb 2025 00:55:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZf-00049A-2b; Sat, 08 Feb 2025 19:53:27 -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 1tgvZc-00047n-5W for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -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 1tgvZb-0007q7-TO for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:23 -0500 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=10Ki5CwYHDx2zWkrrteNX7x/c5MMoKKvU4sISRJ4Qs8=; b=VUyeFE0Asvjk8gEl5Ow6V79VDJ+uziN9Ew0+SYlEK4k8Bwd9+f7u6i+y2vxaQJfPXIKiR2OsvfWmqAEpGZk9be8jWjjVji47f05Y5vo7amyejfwK1S2On1CM+/sVlZCfakHPSm3RB5CBXvtmtNb0IRsEDTdNNvnvYlYlj/ILxBhP+0dV2LpHAvWA9fY6Ny0Lnj1wWA2bqv14dq1HKYjEwnWYV4TEeuIiD47DWMCrPrdziMG0+6w0U/sTKduSV0OGAtTxqhsQhGGRnWhyLp6ErW2BT1Nds05nHJ9Vfu11JQnT0g3eEscJ6cKc012me4Y3A/3Nywlc4p2HvuGrMuSReA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZb-0007Hc-Ou for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 32/47] build-system: perl: Redefine perl-build and perl-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:23 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906239327827 (code B ref 68315); Sun, 09 Feb 2025 00:53:23 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:13 +0000 Received: from localhost ([127.0.0.1]:42117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZQ-0007EY-Oo for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:13 -0500 Received: from 6.mo583.mail-out.ovh.net ([178.32.119.138]:42143) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ7-00078e-9p for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:54 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.140.35]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M75rRRz1Rgx for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:51 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-rlbzk (unknown [10.110.188.54]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 861CE1FE75; Sun, 9 Feb 2025 00:52:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-5b5ff79f4f-rlbzk with ESMTPSA id 4aoMGGP8p2fW7xgA4R8IkA (envelope-from ); Sun, 09 Feb 2025 00:52:51 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G0066e94bce6-9ae1-48ad-ba4f-c75337c62754, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:12 +0100 Message-ID: <20250209005219.25070-33-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18186379721674449634 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdehnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=10Ki5CwYHDx2zWkrrteNX7x/c5MMoKKvU4sISRJ4Qs8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062371; v=1; b=PHyCDyCQbAvwvqS194nP8WDa7pXYBRw8qhaW3Iq/mXOpEc66Kmr9Iqesyv1YeHjPA+ce7R// WZ2JkLXHAoL7yzN7DuS5TyD81W895+CpPZXerTEHadiMfUNClmUZ97Pyx6HieF3zDvo7j2bnQ+t mYK2To2MaCpkDA13UeRdg072JwBrW57FBBAI0PUSbreMLFxXgxFmoZv2e/TEUknOD1106otx/ch QlJf5T0lbH70BCJEi3Y8RuBz+5paQ1756/3iv9u8iGd7/Rr/+r3GRcDPUOkP6YVUk3U2n4dSjwG Ui56A3wwglNsBHsPeJ6PtKlzCElNMQl9R+mNGh3QPf71w== 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/perl.scm (perl-build): Monadic procedure returns a gexp instead of a derivation. (perl-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Id54ae050c2b64269ea42ec9f89d9c3a84ad4429a --- guix/build-system/perl.scm | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 98d48fec7c..3f088fa6bf 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2021 Ludovic Courtès ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define* (perl-build name inputs (guix build utils)))) "Build SOURCE using PERL, and with INPUTS. This assumes that SOURCE provides a `Makefile.PL' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -146,14 +147,8 @@ (define build #:parallel-tests? #$parallel-tests? #:outputs %outputs #:inputs %build-inputs))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (perl-cross-build name #:key source @@ -211,13 +206,8 @@ (define builder #:outputs #$(outputs->gexp outputs) #:inputs #$inputs #:native-inputs #+(input-tuples->gexp build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #false - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define perl-build-system (build-system From patchwork Sun Feb 9 00:51:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38364 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 4C75E27BBEA; Sun, 9 Feb 2025 00:54:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 00E0D27BBE9 for ; Sun, 9 Feb 2025 00:54:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgva9-0004Tm-5e; Sat, 08 Feb 2025 19:53:57 -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 1tgvZc-00048G-Nb for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -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 1tgvZc-0007qC-EM for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -0500 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=fOJ7Z9CN6ARWTrMoxG4R6Fl1IcF9VSlgMZg4fcw7eWg=; b=cG0sbAHZJnj3DzQYFC7wlNVBGkjqHzIxLcpfMIA+dqctfXU7v60LOmAUw2xlSptFtuIhpauA8sbUJyUrWfUpEiK5SCI5FI5BRcK+ltaAucGfnUgK0xiKvB/aTSDmYjIF2FkGGHAZS01CadYFNHNu1h+nH7A6LrjQM9fw8gLGmheLIS1RMaRRmPrknQK3NquiBumTAFC80K9RmgHXKk9qhla9diWj9Ho2N5Cm2yeoHMaZP120VYY+ijsYc0zVv/fS/ksmNUuB6jRQyV6qo12EWOaoMUkn6Tz17hkp7NFVocQwcquskaXOBWQipnEP+8c60pwAc7xIKrLrAjXMRtwDQQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZc-0007Hj-7H for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 33/47] build-system: pyproject: Redefine pyproject-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:24 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906239427836 (code B ref 68315); Sun, 09 Feb 2025 00:53:24 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:14 +0000 Received: from localhost ([127.0.0.1]:42120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZR-0007Em-A0 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:13 -0500 Received: from 8.mo576.mail-out.ovh.net ([46.105.56.233]:36393) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ8-00078l-Bk for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:55 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.17.88]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M85l7nz1rq4 for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:52 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-fx5sd (unknown [10.110.178.220]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9785B1FE0D; Sun, 9 Feb 2025 00:52:52 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-fx5sd with ESMTPSA id BUsQD2T8p2d+aQwAe5C8Xg (envelope-from ); Sun, 09 Feb 2025 00:52:52 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R0024867f04b-102c-47fb-9ab3-9526e977229c, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:13 +0100 Message-ID: <20250209005219.25070-34-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18186661197323428578 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=fOJ7Z9CN6ARWTrMoxG4R6Fl1IcF9VSlgMZg4fcw7eWg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062372; v=1; b=fxlAFAdH9YGInjWMjuhXCGyPi0NIDFH0VpHu7IOUPfkIgGqxrsQL+QcNeqUu0V1BBKs2y/2E AgmgkOTTJubXWBs8HUxHAXsXl6XhrzY2hfeCk3h59XItERSAPoUILBg83J8FRWHEis52a21JVDW behyt6eJ3fblgd1MSD7rSLsyxfusShiPzEcqsu4hQwl7EDXn9bLlfRlwiY/bccpn6mo5jXx43Qc p3rjYp7m8X/RIzPi0vIwPOv/CnLuAGKSBlhYvXCLoEPyMk7vtEbNeNW4y5YzgtWSRZCG0LOrTXt WGKeslx1rDb7Dq/1uK81LIV/5vyL5Ni7x216X1xgmz8Jw== 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/pyproject.scm (pyproject-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ia26001291b472c69c65647d8bddd1199f0ddc483 --- guix/build-system/pyproject.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index bdf8f440ac..04c506b09d 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2022 Marius Bakke +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -109,7 +110,7 @@ (define* (pyproject-build name inputs allowed-references disallowed-references) "Build SOURCE using PYTHON, and with INPUTS." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -134,16 +135,8 @@ (define build search-paths)) #:inputs %build-inputs))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:graft? #f ;consistent with 'gnu-build' - #:target #f - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + (mbegin %store-monad + (return builder))) (define pyproject-build-system (build-system From patchwork Sun Feb 9 00:51:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38379 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 E51D927BBEC; Sun, 9 Feb 2025 00:54:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 7031F27BBE2 for ; Sun, 9 Feb 2025 00:54:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvZi-0004Cx-JB; Sat, 08 Feb 2025 19:53:30 -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 1tgvZd-00048p-5V for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:25 -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 1tgvZc-0007qQ-TD for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -0500 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=P4tuLbqHuYn6cwfR1m6BkCgzO9IkLPHxCb/cvD31sZc=; b=DfBPAyPmbl8eBsFvkDvoRzlaBI6Ij7WCLOKRRKomssRzXV+RAhzePoAJlaDLcrNXbg3SKN2VDx9bLRY+XiADa4rjgv3TGDZ8afcgw5piIMJUpYFX+dNhL3aeFnYjZmJqaMADIEBld/hN+YDWubfg3E1PDv2xymtdee8j3PewBh3zdHVcNo/pn74hfPJWmTb+5oAQ2YiGLr4sQkGPqMJ8SAK/2kcNr8bftLa9tegHZ2sKU+QtxTIPdq8oCLqDRSvfxgrYA4J8aAvNgXOcIVTCyLMsJl4LuNIxzt2uIBNkftgR9I7To5QP9tF9re02B7bD9N/bTofShgAmID+PsX7MDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvZc-0007Hr-O6 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:24 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 34/47] build-system: python: Redefine python-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:24 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906239427857 (code B ref 68315); Sun, 09 Feb 2025 00:53:24 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:14 +0000 Received: from localhost ([127.0.0.1]:42122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgvZS-0007F1-10 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:14 -0500 Received: from 2.mo583.mail-out.ovh.net ([178.33.109.111]:54557) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ8-00078r-VH for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:56 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.17.88]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8M92k0tz1Rj7 for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:53 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-nwdj2 (unknown [10.110.118.36]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3AA171FD2F; Sun, 9 Feb 2025 00:52:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-5b5ff79f4f-nwdj2 with ESMTPSA id 5GgwB2X8p2cylAAAfvMSFg (envelope-from ); Sun, 09 Feb 2025 00:52:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-100R00388126ad7-e44c-49d8-8e27-7084f8fd9cae, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:14 +0100 Message-ID: <20250209005219.25070-35-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18186942674234696418 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutddtnecuvehluhhsthgvrhfuihiivgepkeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=P4tuLbqHuYn6cwfR1m6BkCgzO9IkLPHxCb/cvD31sZc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062373; v=1; b=XsabpbFhBXdqZTDoq/PHwXG5Nd8jplL2DNEtcXnsDFHAXQYFaKyviy9n1vMrRs6YP16pKDkm kmh8+W39sW+tYKzSzZ5mzs0H1kmyJMJ3TtxFa4SSMFSMCepqzDTgwpOZ8ReK/AiuJ2ohHemn4ny 2z85p2IHH6/6vpIfe6AES8ffyDiOUmX/ojleYKlWkZtSSRD5nMXwVu+PyXSEF7s2aL9bvlEn0GV oI/JXXF1JMOVgzWnottgesfWwRl0BHshPvkkRgEc1++92CCQ7YlR4Q7L2JlrZG1wgLELdrM0hVb NpVgPmF5C3W2g57di6U6dEUqRWsdl4005ZySDCKhnTc/Q== 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/python.scm (python-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I1d270fa64192394072279f73ae0d77877d41f01c --- guix/build-system/python.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index a51c033d01..3c37ca11f1 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2021 Lars-Dominik Braun +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -184,7 +185,7 @@ (define* (python-build name inputs disallowed-references) "Build SOURCE using PYTHON, and with INPUTS. This assumes that SOURCE provides a 'setup.py' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -206,15 +207,9 @@ (define build search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:graft? #f ;consistent with 'gnu-build' - #:target #f - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + + (mbegin %store-monad + (return builder))) (define python-build-system (build-system From patchwork Sun Feb 9 00:51:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38382 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 ED70D27BBED; Sun, 9 Feb 2025 00:54:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 9A2BA27BBE2 for ; Sun, 9 Feb 2025 00:54:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaq-0005Kv-RN; Sat, 08 Feb 2025 19:54:40 -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 1tgvaI-0004dl-B2 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54: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 1tgvaI-0007wm-1j for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:06 -0500 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=uOkSc0qN1b0RBvCi/WPP3mJ/zPzMXIfAfX9+MQD6xcw=; b=BZcHMUrw2+5J9anMIFMQ5iczrIaDcX0hwgOPen9r2xVQBYhfsz5HuK8T+cqmW/T0hQ2QEU89jexjhukzts8FFk3W58ULwyrrwZzF0qO/5RzHUqoNbbiZVpRl2NYxJDb2PHOg7kI9s9+frN7wPReGZkkPYpyeDf5sm2dghTbIMz73v1fy0iCpX39p9LtC//gFARfPtuHd+pn9FN2mChufFYcmWwtWNM6Fz5ZOVkobIBgfzYMCk7K3ZTtlsVARPNYQEuDqnjUy4ep4EWFk9Vwy5GzZJ94VIwZfWzuJ0Ud9Att6uc5aeyG7Hyx6XtngU30sLZcg1RBGbXYt31ABCEjEWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaH-0007L6-Qc for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 35/47] build-system: qt: Redefine qt-build and qt-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:05 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243328107 (code B ref 68315); Sun, 09 Feb 2025 00:54:05 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:53 +0000 Received: from localhost ([127.0.0.1]:42157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva4-0007JB-Mq for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:53 -0500 Received: from 1.mo581.mail-out.ovh.net ([178.33.45.51]:40759) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZ9-00078y-K4 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:56 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.176.101]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MB15svz1Htk for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:54 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-55k8x (unknown [10.110.188.54]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E04971FEA1; Sun, 9 Feb 2025 00:52:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-55k8x with ESMTPSA id 8F0vL2X8p2cz8xgAdEC7mw (envelope-from ); Sun, 09 Feb 2025 00:52:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0028a9411a2-8cd6-4521-9f33-00ffefdea4ee, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:15 +0100 Message-ID: <20250209005219.25070-36-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18187224145275052770 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=uOkSc0qN1b0RBvCi/WPP3mJ/zPzMXIfAfX9+MQD6xcw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062374; v=1; b=IBvrAum1GiTdtr0mTgJ3bmYEBe3aV3qIJNB2QV+K7X5twp0UMkiLrx8Mqwxxhv6dmXqPigCH 52s8W1APJKcE0MH9ihoHGWfxGTARSRybxWKHb4LuwDMnRjBjsfoJihAeLDXFmkMSjSxdJU/vQFN S4CoceNAN3LzoBvar2mlDhU348vjm/5Cd6lXcdSwEUZ4oajDvJl/p/ZAAGDzGDul8hqMP04EQ2t JdUiDoO27zx5EQFAhW99MsFjXLJND76NdUqj5bjlJ+o2fWJFZSQZ47QhzjTOT9Aa/jXUQG17b9Q f6g91uXH5i+/+sWXTmsxzTS4SJSq1kOC2Eo/+MT3U3now== 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/qt.scm (qt-build): Monadic procedure returns a gexp instead of a derivation. (qt-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I194a9d1a7c7600af2e991e1efad627a9ced235d1 --- guix/build-system/qt.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index d1f721c54e..6d4b02ac71 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -179,14 +180,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:graft? #f ;consistent with 'gnu-build' - #:system system - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + (mbegin %store-monad + (return builder))) ;;; @@ -270,14 +265,8 @@ (define %outputs #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:graft? #f ;consistent with 'gnu-build' - #:system system - #:guile-for-build guile - #:allowed-references allowed-references - #:disallowed-references disallowed-references))) + (mbegin %store-monad + (return builder))) (define qt-build-system (build-system From patchwork Sun Feb 9 00:51:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38392 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 7004727BBE2; Sun, 9 Feb 2025 00:55:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 CF47527BBEA for ; Sun, 9 Feb 2025 00:55:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaq-0005L2-SC; Sat, 08 Feb 2025 19:54:40 -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 1tgvaJ-0004eG-Ep for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:14 -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 1tgvaI-0007wt-I3 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:06 -0500 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=wAha/YEuOqW54RbkWYjbDyDj3a+hD8ULt8xSfjpDyjg=; b=vD2geLgrExlRsN9lxUyAOelq4e4vEJ24ZJvedByT/Lu+Yy2XZExbLTQSBimP8BtQwpFAonOGX8aduyQdoHdxIgCqAelpCLlERk5ZlUq1MI8P6rnpPwPWY2Wi5sdidPdzmPfePRtNzmLpBsEFPU36M7WGJPI3+2OFRACqcbGs6HL0AMtH0qihFJ2JA4W4tMntG1nPc1YJpHT7BeEUkOSTZPIrp2DvQeMajVMxS2AO/q6qpo2cCiNboCJZqIbvKdNbQoBxfNqJhGcn7WNIOV/qmhC5AY6Akc0RiaIFvTxUVZ2e9s5pCLDsshA/Yo+FSUw1GaQBZ7DEY4nrW4EVqou+9w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaI-0007LF-By for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 36/47] build-system: r: Redefine r-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:06 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243328116 (code B ref 68315); Sun, 09 Feb 2025 00:54:06 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:53 +0000 Received: from localhost ([127.0.0.1]:42159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva5-0007JI-5f for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:53 -0500 Received: from 8.mo576.mail-out.ovh.net ([46.105.56.233]:55143) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZA-000799-3f for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:57 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.139.11]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MC1YTGz1rjc for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:55 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-hb5kh (unknown [10.108.42.39]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E8D6F1FE0F; Sun, 9 Feb 2025 00:52:54 +0000 (UTC) Received: from ngraves.fr ([37.59.142.112]) by ghost-submission-5b5ff79f4f-hb5kh with ESMTPSA id vZ1UKWb8p2cX1AIAUZ3VDg (envelope-from ); Sun, 09 Feb 2025 00:52:54 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-112S0062b991723-b839-447c-89e8-5c410fc0f856, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:16 +0100 Message-ID: <20250209005219.25070-37-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18187505621408015074 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddvnecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeimgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=wAha/YEuOqW54RbkWYjbDyDj3a+hD8ULt8xSfjpDyjg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062375; v=1; b=xqSp3/LmFg6fK8Iue2C0XwRvIasG8MEFBUsdTvnUwL6R8a5DgB04FjmLUIy4Pr0EDNrGA9Bk 3+Iw1bLVxL6Fv2wtPN97p0Nf3Ds++hZ8e+NWGHqXll473P5q0XEUhSqPNPv/Ms8SV9o+eJGKQwF QDdurRPfcrG/OGq1OZamsQIWjttzpEDu8DMlxYEZ/lhRrzhCz2twc9+8RuG4jQnDqYM7YqPU3B6 Laj9ZQGRhpJN42XKLe+xKoly6cCmGQZYM3fxXI6wbn6XG3DnYwDVKu6yAkSNyUMNa83YD4yL+kf Oung/YYgoKbsPMDVzMF30JEs2iAI07Zp5zGnYm0urp4gw== 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/r.scm (r-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8f5a76eac6b65beba95852b7bf1645cd8a7b255a --- guix/build-system/r.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 92449c7dbb..15587b083b 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015-2024 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,12 +138,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 - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define r-build-system (build-system From patchwork Sun Feb 9 00:51:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38372 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 6B5AA27BBEC; Sun, 9 Feb 2025 00:54:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 2E4C727BBE2 for ; Sun, 9 Feb 2025 00:54:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaX-0004qG-Rz; Sat, 08 Feb 2025 19:54: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 1tgvaE-0004bo-S6 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:04 -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 1tgvaE-0007vZ-GH for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:02 -0500 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=K6D8/uhs4TpvP8AYynA1uQfLwRtLhrygDKSgYP0VLaA=; b=cnxOaKESIPg+0Y30A02VdfV2daxsoNB8sf5GUa7XFtw+e3MjUljI/e46ULTFef50N87ekYiq2PAWcL0H4Cf4ciwbimyr5bI9QL4sKEIno//49booSILoLiAM2uPV5SZXEeyKwZwzrNzeULkgClTUbPsDUMde6KTczHdHdJ0+bC/b63lFYAgc7xBMjfiN3b8mqPXEe79zDg1rnI4UtUntYlGxx2bruNsqqv6N8cN7BujRldN4KPqIia2H/SeTt1vpYGFJ7PVX/OFpVfdMgbeBAq8WfLSOlvqQN48uAj9pZobkhLKW7fmXykfvodrqvCDLadTsAyo7zEkCrB3p+lJVGQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaE-0007KU-86 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 37/47] build-system: rakudo: Redefine rakudo-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:02 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906242828067 (code B ref 68315); Sun, 09 Feb 2025 00:54:02 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:48 +0000 Received: from localhost ([127.0.0.1]:42147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva0-0007Ib-8z for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:48 -0500 Received: from 5.mo560.mail-out.ovh.net ([87.98.181.248]:41041) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZB-00079V-M5 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:58 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.25.209]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MD12f7z1chF for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:56 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-sr2rx (unknown [10.108.42.39]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DB9731FDC3; Sun, 9 Feb 2025 00:52:55 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-sr2rx with ESMTPSA id OZziImf8p2fYFgwA0iJdug (envelope-from ); Sun, 09 Feb 2025 00:52:55 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0038898164f-1085-4360-8a60-a1a38c1c6bc7, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:17 +0100 Message-ID: <20250209005219.25070-38-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18187787095662387938 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=K6D8/uhs4TpvP8AYynA1uQfLwRtLhrygDKSgYP0VLaA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062376; v=1; b=HZL0DYviXD2la+Q6wXtHyg6a36TN4Sxm4qaQy7Nc+jl6IQ9g9PEM7rjNuRq3GF2o69740BCz bdbY0L9m07Z+unUSHXBzHajLNDVkRsNx+MqxHtc3XbuLcGbQVhT6nLCLxGEkSFlbKM9gZc6OhGr YdrQKsVFjZKcXTgRmLJMJY1Rc7fb0qa4qvLDmIIiXCrqExlCqUfOQxjU+Rg9LKcMKNku9UOrTnm DCCDzOjz/tLdEjJzDEWIPxI9C9Xr3xVI7M9nMSZA9lmmH7oNmEoVDpyhAn8VUtnvOuuYwMQpvbN WY+OtICaOWFpBJWcGOjjhJXlVxm+eG4bHa0I7vjGlODRg== 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/rakudo.scm (rakudo-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I5f484023b8eb9806ed366e5fc596b844a61f524e --- guix/build-system/rakudo.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/rakudo.scm b/guix/build-system/rakudo.scm index ee13c50791..6d4e9b9f6e 100644 --- a/guix/build-system/rakudo.scm +++ b/guix/build-system/rakudo.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,11 +128,8 @@ (define builder #:outputs #$(outputs->gexp outputs) #: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 rakudo-build-system (build-system From patchwork Sun Feb 9 00:51:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38395 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 2D68F27BBEA; Sun, 9 Feb 2025 00:55:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 DA7A627BBE9 for ; Sun, 9 Feb 2025 00:55:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaq-0005L5-Sy; Sat, 08 Feb 2025 19:54:41 -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 1tgvaH-0004d7-JX for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:09 -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 1tgvaG-0007wG-2R for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:05 -0500 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=i57p/6XyzdUoESrzhrQYzCGI6XUxGr256+H7kHMaka4=; b=Qp1s8pi7RYYyyEE4YmweGydFIaIZVw8XpyvTlrQO9hyxw0KhupxrrCtGabjwt2jDMAtz1+Hs+8qhOiCeE6ix4gwVMlLnGVh4sJXg8lZTcU4I2eXOszCNB/Wnp9bRd3S8W1c1Yf9L+4X0F6QkkHaVShxm0ZYhNkp6k0LqStEnxboCQkH5Xy/Xj90bOAomwzD7YcwJ9fNLi88vZRZw1oRsph+ea0mxPFD02DSCUd/jO6szm4qxuANb2DX32spwmPmn2I05J5I+eCFXodYVW9TsXPzen8ZsonkUcVpWnlWdpOJKPBM9BoknWXfbr7dXarmmGCbOJKpVxx7jObGfAcA0+g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaE-0007Kb-Oh for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 38/47] build-system: rebar: Redefine rebar-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:02 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243028077 (code B ref 68315); Sun, 09 Feb 2025 00:54:02 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:50 +0000 Received: from localhost ([127.0.0.1]:42149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva2-0007Im-0G for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:50 -0500 Received: from 2.mo550.mail-out.ovh.net ([178.32.119.250]:54913) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZC-00079i-A7 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:59 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.140.35]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MD6WRmz1Vnk for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:56 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-6gphg (unknown [10.110.113.13]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A6FCF1FDB0; Sun, 9 Feb 2025 00:52:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-5b5ff79f4f-6gphg with ESMTPSA id DN2UIWj8p2chmAAAC31h2A (envelope-from ); Sun, 09 Feb 2025 00:52:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S001086a2c9b-8641-48ff-99df-c1241f99ff61, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:18 +0100 Message-ID: <20250209005219.25070-39-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18187787095280050914 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgepleenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=i57p/6XyzdUoESrzhrQYzCGI6XUxGr256+H7kHMaka4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062377; v=1; b=EwaRIr8iYZWEZ/xgk1NF7ET5hIVBUE0J2BFDlhHYGUFP4V5o3cGJGB0SQo9bYovp73NJl20m WeyeHOCS4R54dUuCV0hyTbdZxXBDXnxa9UCDwlgWqaaMotwVDNbyMCnslRtIMCl9vLg2JnCtFG6 AweLp+yUtH3eyNWdrMlmExPVI3S25pX58HvpFa6PIEWdRXw+6A5cPepozNPahT/JfQCiBAVx9RH 5mC1Witowc5p4Hguma17iybfL2PqXZxDcEnCzXuSTDmeelr+6fx2PFtpOIimnQl2JymryER83sM XYwNDW+3iEPR4zvhnPV4ebBP/445/mi0uQIiO5OpMXVgg== 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/rebar.scm (rebar-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I7d4a29cfc1bedaa762e25deed41cc0eb802abb9f --- guix/build-system/rebar.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/guix/build-system/rebar.scm b/guix/build-system/rebar.scm index 7c7cc5870f..4766eda9de 100644 --- a/guix/build-system/rebar.scm +++ b/guix/build-system/rebar.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2020 Hartmut Goebel +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,15 +140,8 @@ (define builder search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - ;; Note: Always pass #:graft? #f. Without it, ALLOWED-REFERENCES & - ;; co. would be interpreted as referring to grafted packages. - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define rebar-build-system (build-system From patchwork Sun Feb 9 00:51:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38391 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 19C5127BBEC; Sun, 9 Feb 2025 00:55:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 CCB3327BBE9 for ; Sun, 9 Feb 2025 00:55:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvap-0005HG-FI; Sat, 08 Feb 2025 19:54:39 -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 1tgvaH-0004dA-R0 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54: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 1tgvaG-0007wJ-Ip for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:05 -0500 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=xWgrw9QZYPJq4/xy8LCQb2LXTUQCcUYjDn1qxWbobHE=; b=qp5tfhzNrKyEldlfDahuxqo49XZgWNHQhk9zv5J+NWXOZtkmK8QkprObmhKEuhJjVOyMbhIeUksj8Ved/V+iwQ9shWfuTwX5RUw1FGVYIiLU6VQs7W743mbJnyiJHIW5hpmhvxKAK47uebKsryuJMwefLpUFnb0lA1jV5SQP5dW2dsza4zANZCYIj6+7SW7nQ6/x3DGcmxFXjWWlb6Mhr1FA+4WllbI1GiPV0kZ8HE9O20/89JqTEDFb5BR9hfFy1S/YC/Cs7JZTMNYN7pAQDoks3ggoVN/lY1sN1Ro6cSJ7JewIMMqjE3DBrH8RSYNRt4B3RS7IRWixn5bwTFCtCQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaG-0007Kk-Cd for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 39/47] build-system: renpy: Redefine renpy-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:04 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243128084 (code B ref 68315); Sun, 09 Feb 2025 00:54:04 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:51 +0000 Received: from localhost ([127.0.0.1]:42151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva2-0007Io-Fe for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:50 -0500 Received: from 5.mo575.mail-out.ovh.net ([46.105.62.179]:58743) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZD-00079w-7J for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:00 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.9.217]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MF5Fsrz1kYd for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:57 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-z92df (unknown [10.110.101.52]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 76AF31FDC3; Sun, 9 Feb 2025 00:52:57 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-z92df with ESMTPSA id bMmwFWn8p2dUuwkAT+XA7g (envelope-from ); Sun, 09 Feb 2025 00:52:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0034a6de48f-7eaf-467a-ad76-9600695b7612, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:19 +0100 Message-ID: <20250209005219.25070-40-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18188068573108101858 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgepleenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=xWgrw9QZYPJq4/xy8LCQb2LXTUQCcUYjDn1qxWbobHE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062377; v=1; b=4m90qUGAUe6SMmWhxYBt9yaR8drYKGFZICfe/4R/N9EOBeaunO7lZGjuTM63nzaNo3Vx9XKv sUy90DVZ0BFqNe6K/viW1NCHJ3wHlXHPwODSbQGy4+OGtdqWJCG2iG1tHbfN5ufz30FjwDT9WHa WWomlYPDO0XHACKwQPZDE8ityxq0Pnj6iGY1AKqrG3XRWuBBUJguRgIUw00g7hUtPYca7rqPMwO zAIpLg7bnvHp6ml5rGiDpSoyXIdofnNP76GZCg0V1X9xhGyWlSzHJxwKNbgZDUP3zlz+RTon/JP ZrvlSNnXAhTCuewYvkBBFcvjulbXkqkrgjsJeXh1mN0Ug== 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/renpy.scm (renpy-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I20bf5af43fc9fc41fb2f36637e67d35136bf1606 --- guix/build-system/renpy.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 015dd7c210..f364da1208 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Leo Prikler ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Liliana Marie Prikler +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,11 +105,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 renpy-build-system (build-system From patchwork Sun Feb 9 00:51:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38401 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 1759327BBE2; Sun, 9 Feb 2025 00:55:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 2550D27BBEA for ; Sun, 9 Feb 2025 00:55:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvao-0005B1-6R; Sat, 08 Feb 2025 19:54:38 -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 1tgvaI-0004dC-0A for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54: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 1tgvaH-0007wW-Fl for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:05 -0500 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=Q7EMnI3+IoDWZqVi7K+DMGdhi/Hn8p6n4KHXBskoA4E=; b=B/tnnsP99W4WyDz8RhVMAoA5A15KzCDs7+9Ev0/0bs3gxfT45VvfOnzRUu3f6vknIbV482FZesWioZxEAGbZrCIl+r8qdZAWidwyFeEAJ8ydDdyjkcGZAbNgmOWH7zEKepuFEnYEMpI6N7rdWKoEQcIvJAaVmr48l8Bj3rKtqkGKAbE3FZxJ3dU62rMyV4jy6qsaVk5SHLwxc15IQCy4M8vVyLQBLqHDyDG3g+Zc13OGOX1KYWeEvugCvDng1yDoFZAogWWBqnMwbY/2lSQIwM2SJWE8GsbkLZRafXQ9JDIechAV3iwizqWTQuYVHbx59bxM9H10+omtViEN18m+7g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaH-0007Ky-A9 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 40/47] build-system: ruby: Improve ruby-cross-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:05 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243228100 (code B ref 68315); Sun, 09 Feb 2025 00:54:05 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:52 +0000 Received: from localhost ([127.0.0.1]:42155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva4-0007J7-3l for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:52 -0500 Received: from 13.mo561.mail-out.ovh.net ([188.165.33.202]:56223) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZE-0007AB-B2 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:01 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.25.209]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MG4bx3z1Ryn for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:58 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-rlbzk (unknown [10.110.178.153]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 616DA1FD64; Sun, 9 Feb 2025 00:52:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.111]) by ghost-submission-5b5ff79f4f-rlbzk with ESMTPSA id eoGbD2r8p2fr7xgA4R8IkA (envelope-from ); Sun, 09 Feb 2025 00:52:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-111S0059c4d3bb0-dab7-4b60-aa5f-849641c78daf, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:20 +0100 Message-ID: <20250209005219.25070-41-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18188350048270344930 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddunecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Q7EMnI3+IoDWZqVi7K+DMGdhi/Hn8p6n4KHXBskoA4E=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062378; v=1; b=iOGvHHv1Gw6ms37cP2p4xE+gSYo4ddyHqYao12G1leNbHhRfeFXgd05rXmR5YoUOsdAljHpl YbxbBFnkBezpEonqLC6JAu6f9TXJj9MG+9iOdlfx/Jpot4d8qwaT6yZSOVhnrCiSHGxc/No6yqE ZrnKyZL9b7QQ2lzJvvTw/2PlpKT1vbGKppaQQMFps+1JZc7wgo+RfoIOJgtnly/xqjvSNPphSxF vpsA1K93J8ENe+7uePI2jAhHqLi+LG+U4X0PWsVWhVaNIj0FQHzHE9V9rxSAN91enemLC2MJ03n BGJs7QN4C7BW1wIsvSeXgZmViaSMhHvmN9H4/je1F+5cg== 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/ruby.scm (ruby-cross-build): Use with-imported-modules around the ruby-cross-build builder gexp. Change-Id: I1051124f034f2082ccef531e9bcf37913d5a9449 --- guix/build-system/ruby.scm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index 33aab5f719..f258ade6e7 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson ;;; Copyright © 2014, 2015, 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,24 +89,25 @@ (define* (ruby-build name inputs (guix build utils)))) "Build SOURCE using RUBY and INPUTS." (define build - #~(begin - (use-modules #$@(sexp->gexp modules)) + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) - #$(with-build-variables inputs outputs - #~(ruby-build #:name #$name - #:source #+source - #:system #$system - #:gem-flags #$gem-flags - #:test-target #$test-target - #:tests? #$tests? - #:phases #$(if (pair? phases) - (sexp->gexp phases) - phases) - #:outputs %outputs - #:search-paths '#$(sexp->gexp - (map search-path-specification->sexp - search-paths)) - #:inputs %build-inputs)))) + #$(with-build-variables inputs outputs + #~(ruby-build #:name #$name + #:source #+source + #:system #$system + #:gem-flags #$gem-flags + #:test-target #$test-target + #:tests? #$tests? + #:phases #$(if (pair? phases) + (sexp->gexp phases) + phases) + #:outputs %outputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:inputs %build-inputs))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) @@ -113,7 +115,6 @@ (define build #:system system #:target #f #:graft? #f - #:modules imported-modules #:guile-for-build guile))) (define ruby-build-system From patchwork Sun Feb 9 00:51:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38386 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 49BE327BBEB; Sun, 9 Feb 2025 00:54:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 02E3427BBE2 for ; Sun, 9 Feb 2025 00:54:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvam-00051f-MN; Sat, 08 Feb 2025 19:54:36 -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 1tgvaH-0004dB-U8 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54: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 1tgvaH-0007wM-1S for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:05 -0500 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=j1gnf991RLGPvyEwg4o43kfBCjjkzKrVXFJG/6a7k84=; b=LLBnDP287h63qrsLKltvOUFOJuF2TabJTjki6sJHIGy2zlKBpMPHrtf4x6LvQ8FsBCmMY3rNY5C7ImwRVCl4IwxxYHvsZrz0zMezFBxTW1G/UANIB9MQdfFxta7CED7VztJe+HsDd7iC1UIEWSLuCFjqIrsolUPb1Ipjd71raS9U/bA1ZE3APCcTPoydz1d74yIrDM3FOCftfn7pS+i2d9URNzxOBCb+3AHetugEA0CS/5HWH2zyizKNuyTuf25zyiocj9MW7rltY9xUkaFdpycvFNuj3b1TFa7hnLMGFdfyybs7mqHT6VFplEU33rJgeR8TdSYyEqcwkEWAoKEOUA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaG-0007Kr-Rw for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 41/47] build-system: ruby: Redefine ruby-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:04 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243228091 (code B ref 68315); Sun, 09 Feb 2025 00:54:04 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:52 +0000 Received: from localhost ([127.0.0.1]:42153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva3-0007J0-7t for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:51 -0500 Received: from 9.mo550.mail-out.ovh.net ([178.32.108.172]:55521) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZE-0007AI-G1 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:01 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.140.35]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MH10ywz1W6M for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:59 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-t7gr8 (unknown [10.110.164.11]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 049A21FDB0; Sun, 9 Feb 2025 00:52:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-5b5ff79f4f-t7gr8 with ESMTPSA id 1loNNmr8p2fAoAIAaffayA (envelope-from ); Sun, 09 Feb 2025 00:52:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004af352af7-bad3-41bf-adeb-8b68ad998448, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:21 +0100 Message-ID: <20250209005219.25070-42-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18188631523386122978 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=j1gnf991RLGPvyEwg4o43kfBCjjkzKrVXFJG/6a7k84=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062379; v=1; b=btH8Ir5RAoaRtDWuu+bn3vyJWniLSymSCBuHf1NYYBilJZrl7TMMKaF9rOv+FNFGuHC6wXfB POWpAagBE6FVnxdsNwdW1dMZ6AUtsT8x4q7z1uZyIyVcJ8vjQPfBRcgHHASGYEC1X3GrDVk0lI2 BABmDiSVN9QtE9CHcV6g6CQaYZL8bp/gTqS9rNVyZlHC0NtbRUMkz7etgvJ24XnX2E12Vp6tIdj H9TY6bT0ws9xHYlTSivysIuNkvKs7s48wWXjMH2mtnEHC7aGKxi6F/5c2pXgNfE4nELy0Uh99r6 OaaqbiDnrOzfYNANaflKYDNzsw8jHdtgUXEiAROYzIqdA== 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/ruby.scm (ruby-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8de0e2b382271e9ea09d2be9b6169ccfc792230b --- guix/build-system/ruby.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index f258ade6e7..e1c0ecef4f 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -88,7 +88,7 @@ (define* (ruby-build name inputs (modules '((guix build ruby-build-system) (guix build utils)))) "Build SOURCE using RUBY and INPUTS." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -109,13 +109,8 @@ (define build search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define ruby-build-system (build-system From patchwork Sun Feb 9 00:51:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38400 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 5F3DE27BBF1; Sun, 9 Feb 2025 00:55:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 18C6B27BBE9 for ; Sun, 9 Feb 2025 00:55:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvan-00058u-Tz; Sat, 08 Feb 2025 19:54:38 -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 1tgvaL-0004f2-0y for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:16 -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 1tgvaK-0007xM-A8 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:08 -0500 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=ZgnepgjRhroqVjPNClIAhapwjBmvOd3pioO0kpYvn/s=; b=SIsWGoBPOVlcWAk+D7UloAzXq8kor0UB5p9NhPCxzMwyF/9HtTmZsodxpqYylyGYjigag9CE8jmuhbtiBWMDiuJKq2FnvQUMDJeQOS92jJiGTgJ2kpeDVzGs/4sF/oS9fb1nqpi0MDq2vvX5b/O1KD9v4kdmrRPRUo485a/yzaUhR+5slFci0vmbyG7xIHqBLSop5iAC5ag/KBgPSuS+FfFdCpxWMMHrT7sQz9m4WzZFE1mrcD4Mb4bC3oSbwpcY4n0eN3VGmdVEaNKkxrDWWM7gFMl3CyRFxYJdljYuG3I3uMQKpLfp0X98pK7/eOB/hERwkZsSLSGP/+vRHR26Xg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaJ-0007LW-LD for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 42/47] build-system: scons: Redefine scons-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:07 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243528132 (code B ref 68315); Sun, 09 Feb 2025 00:54:07 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:55 +0000 Received: from localhost ([127.0.0.1]:42163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva6-0007JZ-7e for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:55 -0500 Received: from 18.mo584.mail-out.ovh.net ([188.165.54.143]:38859) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZF-0007AY-Ra for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:03 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.116]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MH6rFYz1RXh for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:59 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-k75ng (unknown [10.110.178.153]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B30771FE07; Sun, 9 Feb 2025 00:52:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-k75ng with ESMTPSA id x+SLIWv8p2dn3hgAy5V6XQ (envelope-from ); Sun, 09 Feb 2025 00:52:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0032506e56e-9459-42be-b349-471f0d818b4b, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:22 +0100 Message-ID: <20250209005219.25070-43-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18188631520189932258 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudegleefkeehudegvdeiffelkeegffeihfekjeduleevueeuhfehveetgfehtdehnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ZgnepgjRhroqVjPNClIAhapwjBmvOd3pioO0kpYvn/s=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062380; v=1; b=tFHSggDyUV/O5GIs7bZWrj4zq7Y593S+qQVmgcE3tonCZqIsOXDXMgZSiwyZGfZk25/V0TiW tqUHQxTE4eLWmmWxMFJ3lDOoFOm/m2l4rhTFLmdZLlJz6cc+ZsifpxcixkdI3Ar3BBH8Gu1FMum K/UbTePNH5K5ztrBNdhHKkcjYPivniLMfueEmdYiAdij90LCizBTRTWFB6cnTOP1GHHhmaCv/Qe 771pFXHX/B1hhG8Bdbvos+CZYs0ht6Cb4OYne9oXjHHTK24eSEpSOeu9OBliOuMSqr6w24RouKT aA8X3RSFqZHMwyQk9dEI2qJdh2+3ohcAZDn7G0/1rL45A== 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/scons.scm (scons-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ic8c99d06ac53b2ba80a02a191d18de92e9c74e6b --- guix/build-system/scons.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index e76c419b1e..1b0dde0f48 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system scons) + #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix monads) @@ -117,11 +119,8 @@ (define builder (map search-path-specification->sexp search-paths))))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define scons-build-system (build-system From patchwork Sun Feb 9 00:51:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38387 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 8AC8E27BBE2; Sun, 9 Feb 2025 00:54:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable 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 D2FC627BBE9 for ; Sun, 9 Feb 2025 00:54:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvap-0005HF-Av; Sat, 08 Feb 2025 19:54:39 -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 1tgvaK-0004f1-Eq for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:16 -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 1tgvaJ-0007xE-C4 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:07 -0500 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=8t9u9xeR+yTkYmRYXmktjTzX96LlCY29UNkEu18AGcM=; b=QYoeM8/Oa/Sy1GQrjGYz+mTec7oYEH+CN1VsWgsFZ7yFGOYnOlpimfFv2BGiV3fvUt1Af2YG6P9/CkU7lF3kTmJF28jr/7xuq40FwCGJomgK/XyGqPqq1O/RLcg9LzyScEO103vOBScong9EIry3zLBFmtJBGcKgMlD+C4WOrThN2aARcGHxChUmCsD+FuUhUl3SktRjosOq/8qtg16yuXl3DeJrCqKoFzfmCg9rx2C7aoywBBcuctVa2ZWIoSmnh5Til1SwoHLAlLVWegzYh5dXwSLsefDzul9FKkESSp1faZ2Pvi6XCRWklRshBywq7y2p23pnaZzz/RYd0iENdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaJ-0007LP-5w for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 43/47] build-system: texlive: Redefine texlive-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:07 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243428124 (code B ref 68315); Sun, 09 Feb 2025 00:54:07 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:54 +0000 Received: from localhost ([127.0.0.1]:42161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva5-0007JW-K4 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:54 -0500 Received: from 20.mo581.mail-out.ovh.net ([46.105.49.208]:33017) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZF-0007As-Os for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:02 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.9.73]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MJ5tDGz1Hpc for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:53:00 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-sr2rx (unknown [10.108.42.126]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 953EE1FDB0; Sun, 9 Feb 2025 00:53:00 +0000 (UTC) Received: from ngraves.fr ([37.59.142.114]) by ghost-submission-5b5ff79f4f-sr2rx with ESMTPSA id 6wZbE2z8p2flFgwA0iJdug (envelope-from ); Sun, 09 Feb 2025 00:53:00 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S00827a02cfa-9613-4bbe-9cd8-140df0d43c92, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:23 +0100 Message-ID: <20250209005219.25070-44-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18188912998233072354 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduudegnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=8t9u9xeR+yTkYmRYXmktjTzX96LlCY29UNkEu18AGcM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062380; v=1; b=0/hiBv2OmjOkGW5K5T1Z9g/KWHAetQG5ZarljgQ67GhHJ0fTPja6uyBlYNhbTTM9p6L+HY8U +uVg6/zfTYI8oaiwmDZD79WRbY7lDfSoPOpcW9vpqyq77im5+/8Yj9WpCkup8gm9vZlEZ5KQ5y5 VQNx9AvXaBqWuPTFkljIcVoxNoxS5bC/wPUTEg7/asA7WXLJntsrApFaBu6mhtSsUNS7P1/jMM+ Uu/4qGNNDiiOXFWG4uN4NmwLyYEqUs/8M/isxgKcE7lvMKZlKUi6l4Z3UP5nsy202ANGJypiRkg n2RXTozaYCm/dYEY5aKfmgZYkwZoxJ1Mtad2wvxH2Axpw== 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 35587b50fc..b5b687e4e4 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 From patchwork Sun Feb 9 00:51:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38388 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 4349527BBEA; Sun, 9 Feb 2025 00:55:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 8591427BBE2 for ; Sun, 9 Feb 2025 00:55:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvar-0005Ma-Gs; Sat, 08 Feb 2025 19:54:41 -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 1tgvaS-0004gw-A4 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:16 -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 1tgvaL-0007xo-Mi for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:11 -0500 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=FBtPkYrEs0rj2ng63BACbILrmivrESMp1kYqwilDIqA=; b=bqC0vGygp4hNn03TQEJq1mEdGruEs8badGBRM8fRSOM0dc6oa1uz40kXp33FsEH9Tvb7NraHAYpmK1wIqJuVRmtxLa7veUefOsH55GZCFG+trSkc4IgjAeW+o76JsfKFoaWfyuEZwLJrBbDc7uXfrGI7cFBNbJO20SK0dmKEfp1XWoUDMHGTM7Bd5MqC0ol1/1erWHqhwEcPE8+V7OVR9BtRMW2BJe4X3ZK4aRWZQaaOq0mArg8yQDtVVHPf6nzs9TXkwJjwV9MLgC5S0oV5WYvhmHB9RVKV5J6Av2XX8Ee7LvB+Pn5INxFNyTbOPJs2/epsF1pNgHrSQS4iLvY8vw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaK-0007Lh-M0 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 44/47] build-system: tree-sitter: Redefine tree-sitter-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:08 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243528140 (code B ref 68315); Sun, 09 Feb 2025 00:54:08 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:55 +0000 Received: from localhost ([127.0.0.1]:42165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva7-0007Jh-Bk for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:55 -0500 Received: from 3.mo576.mail-out.ovh.net ([188.165.52.203]:37033) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZH-0007B9-3O for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:04 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.25.209]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MK5JNNz1rw7 for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:53:01 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jtgr8 (unknown [10.110.178.33]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 71C351FD2C; Sun, 9 Feb 2025 00:53:01 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-5b5ff79f4f-jtgr8 with ESMTPSA id poD2EW38p2d5hCcAmJ4t+A (envelope-from ); Sun, 09 Feb 2025 00:53:01 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R006f34908d1-f3c1-425b-b209-9b2510c9d8da, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:24 +0100 Message-ID: <20250209005219.25070-45-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18189194471709663970 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgepkeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeimgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=FBtPkYrEs0rj2ng63BACbILrmivrESMp1kYqwilDIqA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062381; v=1; b=2QqRhrVJ5Eep7f0VbpX1ExAlYT2Lxxv7A8kOd0wFTQUtDCw/PPPNqhmqk17uZYbe+dgcnelF 8vsrDway3CPVh8EvrZjC3KnwsDAQC5cmijYy3e+RKLQGvKgKBjHCkziDFzv7E/TlTBLlBzu7Sqv K9ycxO/k7xynoOucjdVqsyo84iV+7o6wFUP7rfxFCpV4fA5Bgb3ws3x43vdYyEeaEm1uvYT38XQ q1y9pl4MuZpUX6GDOsvyOhdriBL2DhNlWwSsrTxo+Z3RJc44XLX9Il5+UoUzDp5oX8+g/qI6hDQ 4LjcBdspecQ08Z6m0sEY6dPKmO97fhfdNNONIgbQf5qRw== 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/tree-sitter.scm (tree-sitter-build): Monadic procedure returns a gexp instead of a derivation. (tree-sitter-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I761d0663a511deefd0626ad427be22df09b72894 --- guix/build-system/tree-sitter.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sitter.scm index 21c4eb35b2..c9e45b1fb9 100644 --- a/guix/build-system/tree-sitter.scm +++ b/guix/build-system/tree-sitter.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -119,11 +120,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* (tree-sitter-cross-build name #:key @@ -179,12 +177,8 @@ (define %build-inputs search-path-specification->sexp native-search-paths)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define tree-sitter-build-system (build-system From patchwork Sun Feb 9 00:51:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38404 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 8A08627BBEA; Sun, 9 Feb 2025 00:55:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 48CA127BBE2 for ; Sun, 9 Feb 2025 00:55:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvao-0005Er-NK; Sat, 08 Feb 2025 19:54:38 -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 1tgvaS-0004gu-96 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:16 -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 1tgvaM-0007xr-A2 for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:12 -0500 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=ayvQvJx4YfADKeVQ0/366ILk3KVXwhSyUVQfc9Hxvx0=; b=X9USYATCYxNVXD9nCBsgn5YQ+p21fFpw3t9Z7EXhPs3z49Wf8OO+QIMGPc8cgwGO4uLhAjR/ooDby+NjyQ7EZxbLI5UkmDRwCv0oXr6IpPayJPpOHUAXhpfmN2SxPjJ6eSXkPNfK9poaL1H2tgp5bcy/ZBo3zok9aA2b5+eFDHg2mUQcbj4geeqvJu6UQfq/01CKBW7sL44LNJ5m0daH8hfZWgLuCT7mYY8NfkWuI1xjoKDSlExMFlQ63IuUhXMP3axnjnu0XBztoNn7GSGCZh8GkMVXwK/Zerwgt+Qf4WvSvcWz8hXX9uKDt6uLNsi00wCVEWVjNe9esFlHW5F//g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaM-0007Ls-0F for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 45/47] build-system: vim: Redefine vim-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:09 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243628146 (code B ref 68315); Sun, 09 Feb 2025 00:54:09 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:56 +0000 Received: from localhost ([127.0.0.1]:42167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva7-0007Jp-Pv for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:56 -0500 Received: from 6.mo560.mail-out.ovh.net ([87.98.165.38]:45245) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZH-0007BJ-Tp for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:05 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.139.183]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8ML3M0vz1chV for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:53:02 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-q6hnb (unknown [10.110.168.31]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3F4851FD64; Sun, 9 Feb 2025 00:53:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-q6hnb with ESMTPSA id mNGkB278p2dsjScAjAle1A (envelope-from ); Sun, 09 Feb 2025 00:53:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002a4a9d764-2d44-43f2-b259-31efd69b1406, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:25 +0100 Message-ID: <20250209005219.25070-46-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18189475947136934626 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ayvQvJx4YfADKeVQ0/366ILk3KVXwhSyUVQfc9Hxvx0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062382; v=1; b=qHdNJ1FRTuWu5HL99WloAzkZeJc6TVYfVP4btPUUf5Jf7Y3j7IZEY+PTsjHUl3I7bep2phDB 3aRWBHRywmO0xwTcRrPV5tDHsvNLAUbpZ8TbfwypwDdpQC5/Xz5jR+TS1t66GR1EufPuLKCPWdY Qlid1VrGE3MCyjP+D9vpbCJiE3aXZRiu3CUIsFD8OtTX68IWfq4ku7meRGflxZYnANrFMC9m+NA j5KThGJwCdKS1XSz7VSqEZNcBQ/PU4/XQU6t2IErSuaINh/fC60xdd88K1X+A+8GY4MWmBjT5N7 2VkKQCIWXGYqN5k1GEkvvnLVJrGeUW/+zYcmaxp5HOWcg== 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/vim.scm (vim-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Iedbb15faac445f169cffa16397b357bc4f15c0f6 --- guix/build-system/vim.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/guix/build-system/vim.scm b/guix/build-system/vim.scm index dddf7ea14b..22c38aefca 100644 --- a/guix/build-system/vim.scm +++ b/guix/build-system/vim.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Jonathan Scoresby ;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define* (vim-build name inputs (modules '((guix build vim-build-system) (guix build utils)))) - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@modules) @@ -151,16 +152,8 @@ (define build #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad - ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name - build - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define vim-build-system (build-system (name 'vim) From patchwork Sun Feb 9 00:51:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38403 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 C4A5027BBE2; Sun, 9 Feb 2025 00:55:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 3757B27BBEC for ; Sun, 9 Feb 2025 00:55:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaq-0005J9-0d; Sat, 08 Feb 2025 19:54:40 -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 1tgvaS-0004gv-9l for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:16 -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 1tgvaM-0007xv-Nt for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:12 -0500 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=mSdgLzSlfFSOBLiJO9Oi+0eDx3UVmM04IBcdHNfZ2sw=; b=FQRt8RZ9IFIJFFObQSywy4B2ze5xulfInFuhGvWssPWDW7Oa6D1SRfAj3Ji5heSCt0uh8VMfG4KC8cLuf4IDeyWwetlPqj5O6DJ49j43bHJTFBmvikLgeXXjaTgodHcbMSP3RaKfwlpBY5imzP3813no+P8AeyOqITHnZq2d+yaOyGNeFfACMTSgYCSc3Yyu7+WQWiTHyIBApPPnJ3Y3/7KgHtqCH64Y0qmPCzLZI9SeIn+V5UyNAOUP2rJjBkKMwHLDczZvYeb84nf38tw/+tS02cqIdVW5zbKVeoylS26wJnHNHdqbLORon++A2SKCGwr3FK97fFcbGN2/OAYxnA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaM-0007Lz-Is for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 46/47] build-system: waf: Improve waf-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:10 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243628155 (code B ref 68315); Sun, 09 Feb 2025 00:54:10 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:56 +0000 Received: from localhost ([127.0.0.1]:42169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva8-0007K0-7a for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:56 -0500 Received: from 18.mo561.mail-out.ovh.net ([87.98.172.162]:58865) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZI-0007Be-R4 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:06 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.2.89]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MM2hC4z1FPG for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:53:03 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-zm64m (unknown [10.110.164.191]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1C37E1FE6D; Sun, 9 Feb 2025 00:53:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.111]) by ghost-submission-5b5ff79f4f-zm64m with ESMTPSA id EUpQOm78p2f+CwoAhrMGow (envelope-from ); Sun, 09 Feb 2025 00:53:03 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-111S0055bf85ca6-0185-4bde-958c-124ad46170b3, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:26 +0100 Message-ID: <20250209005219.25070-47-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18189757420971811554 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddunecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=mSdgLzSlfFSOBLiJO9Oi+0eDx3UVmM04IBcdHNfZ2sw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062383; v=1; b=YkpEodpeU0MRGJxIST/SKaxsC148DQRpN9BDrCn9ERbTFebUX6WtWpNAzBoAc8e8Pm7UctBt Lt0DyvTk6fdt2ceXiKN7WaLEKY5elvaDsW02b+5ZOTs6GCkkOcDxfpQPUeO3J5gyVdnH3h+pBpR 8f+5cdCFSRf5vmz8+cVBgj+kIiSXF38+/U+NViuOKng2pRQssAoCrUtN1doZ3t0lcUpStnH9XfE voD9562Ujh4KLzWd+UF9fdS9BnCb8zIMvHewbNfRvZ50b2jPueWqlyBr0Axfy84C1buATECgrFC +4X5CvE5D89hEAmIImOBZUVHRVHxaUh22BTXEA0YCCR6g== 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/waf.scm (waf-build): Use with-imported-modules around the waf-build builder gexp. Change-Id: Id242046eb4bfef90dba60d7c3b1b68597ddf502e --- guix/build-system/waf.scm | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index 5f24615514..4ca293ffd8 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,22 +87,23 @@ (define* (waf-build name inputs "Build SOURCE with INPUTS. This assumes that SOURCE provides a 'waf' file as its build system." (define build - #~(begin - (use-modules #$@(sexp->gexp modules)) + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) - #$(with-build-variables inputs outputs - #~(waf-build #:name #$name - #:source #+source - #:configure-flags #$configure-flags - #:system #$system - #:test-target #$test-target - #:tests? #$tests? - #:phases #$phases - #:outputs %outputs - #:search-paths '#$(sexp->gexp - (map search-path-specification->sexp - search-paths)) - #:inputs %build-inputs)))) + #$(with-build-variables inputs outputs + #~(waf-build #:name #$name + #:source #+source + #:configure-flags #$configure-flags + #:system #$system + #:test-target #$test-target + #:tests? #$tests? + #:phases #$phases + #:outputs %outputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:inputs %build-inputs))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) From patchwork Sun Feb 9 00:51:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38397 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 38B2C27BBEA; Sun, 9 Feb 2025 00:55:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 EE25F27BBE2 for ; Sun, 9 Feb 2025 00:55:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgvaq-0005Jv-AU; Sat, 08 Feb 2025 19:54:40 -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 1tgvaS-0004h0-Aw for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:16 -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 1tgvaN-0007xw-6R for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:14 -0500 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=/fNzeNxjrBu0xvnB1RQ7Q5W9XA26DCKNMiHRF4Jqobw=; b=RhYf18R0l8YV2WrcY4g7QjQmySSG0QeeNRFyNkslo7Bo44hYNP72xvtSFyCEpVCEAkGE/jo3s2WAXcySI+ryQCxoNRMDKdKRo392HxZ2eNUxp0YgC81TyVzGCw0xdhqip6Uy55ZXC5QJFiZ4TlZ0HmTXTY679ZPuLfKdgFlAsUIZwrxhWik10CwqFWYnFDxPFUxwx6RFhB35aXg9fUATP4qYUNYbsjt8d1XjtMhjc+YZrbU577KlbNRUPIsquC7Lti0iTG8z/4+Dzo4Np+NqAJNN2FmsmEbpWHpfTh9syv0vjEKI2PwnXtOKzMg4S/39667bwVcysP5ssDlq/DOqEQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tgvaN-0007M6-0w for guix-patches@gnu.org; Sat, 08 Feb 2025 19:54:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 47/47] build-system: zig: Redefine zig-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:54:10 +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 moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906243728161 (code B ref 68315); Sun, 09 Feb 2025 00:54:10 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:53:57 +0000 Received: from localhost ([127.0.0.1]:42171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tgva8-0007K5-OD for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:57 -0500 Received: from 15.mo550.mail-out.ovh.net ([188.165.38.232]:51825) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tgvZJ-0007Bu-M2 for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:53:06 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.17.88]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8MN1ZMlz1W6T for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:53:04 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-pgmt2 (unknown [10.111.182.36]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id F26C51FE77; Sun, 9 Feb 2025 00:53:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.113]) by ghost-submission-5b5ff79f4f-pgmt2 with ESMTPSA id Y7ukLG/8p2f9FAAAorCVYw (envelope-from ); Sun, 09 Feb 2025 00:53:03 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-113S007816e9c5c-8a6e-4598-8063-7e13389c9e5d, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:51:27 +0100 Message-ID: <20250209005219.25070-48-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18190038897158513378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduudefnecuvehluhhsthgvrhfuihiivgepuddunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=/fNzeNxjrBu0xvnB1RQ7Q5W9XA26DCKNMiHRF4Jqobw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062384; v=1; b=PVLeNqjcTE5qP4iXaOnp6mOVv1LgtFmDoqGdmrbec2jfJeHDGP81VsSVGpxerVM5QU1MGZXl qhGiLBsHERRzgkmI6dArV/3fQD/cKNdY06/PRL8d3Lf3krqWyJghIfD1aydL/WycCN1R8MK9W9e NyP5iLN6zr1fcWtWZO/BhBqwCvCvbChUkTu+dE7Vtnsadr6BuJ3JFK5bw5UhlTxJkG9PQBxoAMh yRMiA5hWQRtNDJlHNQxHh0ZnsDRWAJPs+W1oGih88zj2wFfUd8jbI4vWNCV0QAYnUJkRbtTiGV+ FkrlvXZfrdT8TyQjHQqAtnigdXwY/nYZ/+zv5S/wy5PyA== 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/zig.scm (zig-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ide64e7047d6e7127024471b311366f3cf8533e00 --- guix/build-system/zig.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/zig.scm b/guix/build-system/zig.scm index 43d6ee977c..3d6eddca3a 100644 --- a/guix/build-system/zig.scm +++ b/guix/build-system/zig.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Ekaitz Zarraga +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,11 +91,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* (zig-cross-build name #:key