X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 00/48] Extend bag-build to gexps.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:02:01 +0000
Resent-Message-ID: <handler.68315.B.170470087828974 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.170470087828974
(code B ref -1); Mon, 08 Jan 2024 08:02:01 +0000
Received: (at submit) by debbugs.gnu.org; 8 Jan 2024 08:01:18 +0000
Received: from localhost ([127.0.0.1]:34892 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkZR-0007Wq-KP
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:01:18 -0500
Received: from lists.gnu.org ([2001:470:142::17]:58956)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkZN-0007L9-QI
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:01:15 -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 <ngraves@HIDDEN>)
id 1rMkZ9-0002h0-RH
for guix-patches@HIDDEN; Mon, 08 Jan 2024 03:00:59 -0500
Received: from 1.mo583.mail-out.ovh.net ([188.165.57.91])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ngraves@HIDDEN>)
id 1rMkZ7-0001yZ-4o
for guix-patches@HIDDEN; Mon, 08 Jan 2024 03:00:59 -0500
Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.2.206])
by mo583.mail-out.ovh.net (Postfix) with ESMTP id 1A62129F11
for <guix-patches@HIDDEN>; Mon, 8 Jan 2024 08:00:53 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-5szj2 (unknown [10.110.168.56])
by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BE5A11FEB0;
Mon, 8 Jan 2024 08:00:52 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.110])
by ghost-submission-6684bf9d7b-5szj2 with ESMTPSA
id Hs1uKrSrm2X4HAAAUmVnLQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:00:52 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-110S00496538144-fbec-4cb4-b4b9-29389e313b07,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:00:48 +0100
Message-ID: <20240108080048.25026-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12372795552383951586
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdduuddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht
Received-SPF: pass client-ip=188.165.57.91; envelope-from=ngraves@HIDDEN;
helo=1.mo583.mail-out.ovh.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001,
RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Rationale:
Almost all build-systems are defined with gexpressions in functions
that return derivations. Derivations are not easily extensible while
gexps are. An example usage is given below.
This is a pretty big rewrite that should recompile almost all packages,
but a lot of grafting happens such as I could rebuild my system quickly.
I was trying to get the build-phases of an existing package to apply to
a local repository, because guix as a development tool for heavy packages
(emacs, ungoogled-chromium) is tedious, and there are precious info in
build-phases that can be applied in a local repository. I'm not aware of
prior work on this particular issue.
These patches allow to do extensions such as:
(build-system
(name 'local-gnu)
(description "GNU Build System applied in the current directory")
(lower
(lambda* args
(let ((old-bag (apply
(build-system-lower
(package-build-system emacs-pgtk))
args)))
(bag
(inherit old-bag)
(build
(lambda* build-args
(mlet %store-monad
((builder (apply (bag-build old-bag) build-args)))
(return (with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
(with-directory-excursion #$(getcwd)
#$builder))))))))))))
Of course this type of build-system isn't directly applicable because of
the chroot of the builder, but this other trick makes it happen :
;; We can't use package->derivation directly because we want the user rather
;; than the daemon to build the derivation.
(with-store store
(run-with-store store
(mlet* %store-monad ((bag -> (package->bag pkg))
(drv (bag->derivation bag pkg)))
;; ensure inputs are in the store.
(built-derivations (derivation-inputs drv))
(with-environment-excursion
(apply invoke (derivation-builder (pk 'd drv))
(derivation-builder-arguments drv))))))
This isn't polished yet, but could serve as an handy way to develop
heavy packages locally while taking advantage of the code that's
already in guix build phases.
Nicolas Graves (48):
guix: packages: Extend bag-build to support gexp.
build-system: gnu: Improve gnu-cross-build style.
build-system: gnu: Redefine gnu-build and gnu-cross-build.
build-system: agda: Redefine agda-build.
build-system: android-ndk: Redefine gnu-build.
build-system: ant: Redefine ant-build.
build-system: asdf: Redefine asdf-build.
build-system: cargo: Redefine cargo-build and cargo-cross-build.
build-system: chicken: Redefine chicken-build.
build-system: clojure: Redefine clojure-build.
build-system: cmake: Redefine cmake-build and cmake-cross-build.
build-system: composer: Redefine composer-build.
build-system: copy: Redefine copy-build.
build-system: dub: Redefine dub-build.
build-system: dune: Redefine dune-build.
build-system: elm: Redefine elm-build.
build-system: emacs: Redefine emacs-build.
build-system: font: Redefine font-build.
build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style.
build-system: glib-or-gtk: Redefine glib-or-gtk-build functions.
build-system: go: Redefine go-build and go-cross-build.
build-system: guile: Redefine guile-build and guile-cross-build.
build-system: haskell: Redefine haskell-build.
build-system: julia: Redefine julia-build.
build-system: linux-module: Redefine linux-module-build functions.
build-system: maven: Redefine maven-build.
build-system: meson: Redefine meson-build and meson-cross-build.
build-system: minify: Redefine minify-build.
build-system: mix: Redefine mix-build.
build-system: node: Redefine node-build.
build-system: ocaml: Redefine ocaml-build.
build-system: perl: Redefine perl-build and perl-cross-build.
build-system: pyproject: Redefine pyproject-build.
build-system: python: Redefine python-build.
build-system: qt: Redefine qt-build and qt-cross-build.
build-system: r: Redefine r-build.
build-system: rakudo: Redefine rakudo-build.
build-system: rebar: Redefine rebar-build.
build-system: renpy: Redefine renpy-build.
build-system: ruby: Improve ruby-cross-build style.
build-system: ruby: Redefine ruby-build.
build-system: scons: Redefine scons-build.
build-system: texlive: Redefine texlive-build.
build-system: tree-sitter: Redefine tree-sitter-build functions.
build-system: vim: Redefine vim-build.
build-system: waf: Improve waf-build style.
build-system: zig: Redefine zig-build.
build-system: trivial: Redefine trivial-build functions.
guix/build-system.scm | 2 +-
guix/build-system/agda.scm | 8 +-
guix/build-system/android-ndk.scm | 8 +-
guix/build-system/ant.scm | 8 +-
guix/build-system/asdf.scm | 8 +-
guix/build-system/cargo.scm | 19 ++---
guix/build-system/chicken.scm | 8 +-
guix/build-system/clojure.scm | 8 +-
guix/build-system/cmake.scm | 24 ++----
guix/build-system/composer.scm | 9 +--
guix/build-system/copy.scm | 11 +--
guix/build-system/dub.scm | 8 +-
guix/build-system/dune.scm | 9 +--
guix/build-system/elm.scm | 8 +-
guix/build-system/emacs.scm | 8 +-
guix/build-system/font.scm | 10 +--
guix/build-system/glib-or-gtk.scm | 115 ++++++++++++----------------
guix/build-system/gnu.scm | 119 +++++++++++++----------------
guix/build-system/go.scm | 20 ++---
guix/build-system/guile.scm | 21 ++---
guix/build-system/haskell.scm | 8 +-
guix/build-system/julia.scm | 8 +-
guix/build-system/linux-module.scm | 17 ++---
guix/build-system/maven.scm | 8 +-
guix/build-system/meson.scm | 25 ++----
guix/build-system/minify.scm | 8 +-
guix/build-system/mix.scm | 12 +--
guix/build-system/node.scm | 8 +-
guix/build-system/ocaml.scm | 9 +--
guix/build-system/perl.scm | 22 ++----
guix/build-system/pyproject.scm | 13 +---
guix/build-system/python.scm | 12 +--
guix/build-system/qt.scm | 17 ++---
guix/build-system/r.scm | 9 +--
guix/build-system/rakudo.scm | 8 +-
guix/build-system/rebar.scm | 12 +--
guix/build-system/renpy.scm | 8 +-
guix/build-system/ruby.scm | 48 ++++++------
guix/build-system/scons.scm | 9 +--
guix/build-system/texlive.scm | 11 +--
guix/build-system/tree-sitter.scm | 16 ++--
guix/build-system/trivial.scm | 41 ++++------
guix/build-system/vim.scm | 15 +---
guix/build-system/waf.scm | 32 ++++----
guix/build-system/zig.scm | 8 +-
guix/packages.scm | 53 ++++++++++---
46 files changed, 348 insertions(+), 520 deletions(-)
--
2.41.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Nicolas Graves <ngraves@HIDDEN> Subject: bug#68315: Acknowledgement ([PATCH 00/48] Extend bag-build to gexps. ) Message-ID: <handler.68315.B.170470087828974.ack <at> debbugs.gnu.org> References: <20240108080048.25026-1-ngraves@HIDDEN> X-Gnu-PR-Message: ack 68315 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 68315 <at> debbugs.gnu.org Date: Mon, 08 Jan 2024 08:02:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 68315 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 68315: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68315 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 01/48] guix: packages: Extend bag-build to support gexp.
References: <20240108080048.25026-1-ngraves@HIDDEN>
In-Reply-To: <20240108080048.25026-1-ngraves@HIDDEN>
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:02 +0000
Resent-Message-ID: <handler.68315.B68315.170470104830103 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470104830103
(code B ref 68315); Mon, 08 Jan 2024 08:05:02 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:08 +0000
Received: from localhost ([127.0.0.1]:34898 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcB-0007pS-FK
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:07 -0500
Received: from 6.mo576.mail-out.ovh.net ([46.105.50.107]:41433)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkc8-0007p8-9U
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:05 -0500
Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.9.153])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id D196C2F9FB
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:03:56 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-mnvcv (unknown [10.109.176.19])
by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 53D421FE9D;
Mon, 8 Jan 2024 08:03:56 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.108])
by ghost-submission-6684bf9d7b-mnvcv with ESMTPSA
id xo6pC2ysm2WDAwAAlH3eGw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:03:56 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-108S002fcf82da2-9559-4fe7-bfa9-bbd35ead7bd9,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:33 +0100
Message-ID: <20240108080350.1665-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12424305473771791074
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetveehffevvdfgtddthedvhfeguefggeffteetueeliedvhffhjeegudehleegheenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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> 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 930b1a3b0e..8ff9ca60a9 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2022 Maxime Devos <maximedevos@HIDDEN>
;;; Copyright © 2022 jgart <jgart@HIDDEN>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -50,6 +51,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)
@@ -1889,12 +1891,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
@@ -1916,10 +1918,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))
@@ -1960,6 +1962,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))
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 02/48] build-system: gnu: Improve gnu-cross-build style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:02 +0000
Resent-Message-ID: <handler.68315.B68315.170470104830111 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470104830111
(code B ref 68315); Mon, 08 Jan 2024 08:05:02 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:08 +0000
Received: from localhost ([127.0.0.1]:34900 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcB-0007pU-Vn
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:08 -0500
Received: from 19.mo583.mail-out.ovh.net ([46.105.35.78]:51601)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkc9-0007pA-Nz
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:06 -0500
Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.176.8])
by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4D33326B25
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:03:58 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-g4dsk (unknown [10.110.178.220])
by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B575D1FDF1;
Mon, 8 Jan 2024 08:03:57 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.103])
by ghost-submission-6684bf9d7b-g4dsk with ESMTPSA
id BBIRKG2sm2U5mCwAQKEHUQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:03:57 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-103G0057aec1ea6-fd29-411e-b691-da76ba8b486e,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:34 +0100
Message-ID: <20240108080350.1665-2-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12424586950433628898
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 | 93 ++++++++++++++++++++-------------------
1 file changed, 47 insertions(+), 46 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index cdbb547773..c3de5c2544 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-2023 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -511,56 +512,57 @@ (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
- #: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
+ #: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))
system #:graft? #f)))
@@ -568,7 +570,6 @@ (define %outputs
#:system system
#:target target
#:graft? #f
- #:modules imported-modules
#:substitutable? substitutable?
#:allowed-references allowed-references
#:disallowed-references disallowed-references
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 03/48] build-system: gnu: Redefine gnu-build and gnu-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:03 +0000
Resent-Message-ID: <handler.68315.B68315.170470105130134 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105130134
(code B ref 68315); Mon, 08 Jan 2024 08:05:03 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:11 +0000
Received: from localhost ([127.0.0.1]:34904 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcE-0007pv-Kj
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:10 -0500
Received: from 4.mo550.mail-out.ovh.net ([46.105.76.26]:45947)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcB-0007pP-SN
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:09 -0500
Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.139.129])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id 3BF252775E
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:03:59 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-m5qnx (unknown [10.110.96.89])
by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D68F91FEB7;
Mon, 8 Jan 2024 08:03:58 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.101])
by ghost-submission-6684bf9d7b-m5qnx with ESMTPSA
id lr8fLW6sm2U2RgAAxu9BGQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:03:58 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G004ee21fee3-9699-4bec-b4e7-5280773d37fe,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:35 +0100
Message-ID: <20240108080350.1665-3-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12425149897607144162
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index c3de5c2544..f753aeea28 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -421,18 +421,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)))
;;;
@@ -564,16 +554,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 gnu-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 04/48] build-system: agda: Redefine agda-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:04 +0000
Resent-Message-ID: <handler.68315.B68315.170470105130146 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105130146
(code B ref 68315); Mon, 08 Jan 2024 08:05:04 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:11 +0000
Received: from localhost ([127.0.0.1]:34907 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcE-0007q0-VK
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:11 -0500
Received: from 1.mo576.mail-out.ovh.net ([178.33.251.173]:50163)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcC-0007pQ-4b
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:09 -0500
Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.9.153])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id 6EC8D2FC21
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:00 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-cmkt4 (unknown [10.108.9.163])
by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2DD2E1FD7A;
Mon, 8 Jan 2024 08:04:00 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.107])
by ghost-submission-6684bf9d7b-cmkt4 with ESMTPSA
id ZarLAnCsm2WSAQAAL5bsSw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:00 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-107S001e97a23b1-b0dd-4488-b715-66617063e4db,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:36 +0100
Message-ID: <20240108080350.1665-4-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12425431375447646946
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 35
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdlfeehmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 64983dff60..b76c72ef44 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 <dev@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -109,11 +110,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 05/48] build-system: android-ndk: Redefine gnu-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:04 +0000
Resent-Message-ID: <handler.68315.B68315.170470105530188 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105530188
(code B ref 68315); Mon, 08 Jan 2024 08:05:04 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:15 +0000
Received: from localhost ([127.0.0.1]:34914 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcI-0007qk-Hp
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:14 -0500
Received: from 16.mo583.mail-out.ovh.net ([87.98.174.144]:57301)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcE-0007pZ-Pt
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:11 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.25.16])
by mo583.mail-out.ovh.net (Postfix) with ESMTP id A6A4D24AA5
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:01 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-85jpc (unknown [10.110.113.129])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4D4BF1FEB3;
Mon, 8 Jan 2024 08:04:01 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.107])
by ghost-submission-6684bf9d7b-85jpc with ESMTPSA
id mbreEnGsm2UR5wEAwvW9MQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:01 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-107S0014ec6ec6f-91d4-4860-8e87-2dead89b93ce,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:37 +0100
Message-ID: <20240108080350.1665-5-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12425712848502973154
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 aa7cc06279..cee5d6674d 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 <dannym@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 06/48] build-system: ant: Redefine ant-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:05 +0000
Resent-Message-ID: <handler.68315.B68315.170470105530199 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105530199
(code B ref 68315); Mon, 08 Jan 2024 08:05:05 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:15 +0000
Received: from localhost ([127.0.0.1]:34916 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcI-0007qr-Ub
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:15 -0500
Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:34395)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcF-0007pp-0z
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:12 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.2.211])
by mo560.mail-out.ovh.net (Postfix) with ESMTP id 2C83F26002
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:03 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-m8ggv (unknown [10.110.96.92])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BF3841FEEE;
Mon, 8 Jan 2024 08:04:02 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-m8ggv with ESMTPSA
id DwBSL3Ksm2X1HAAAWsevSg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:02 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G00635d09119-e3e0-4dfd-ba17-7927fbde5bde,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:38 +0100
Message-ID: <20240108080350.1665-6-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12426275798907085538
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 84bf951fab..4e04737dda 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 <rekado@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 07/48] build-system: asdf: Redefine asdf-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:05 +0000
Resent-Message-ID: <handler.68315.B68315.170470105530206 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105530206
(code B ref 68315); Mon, 08 Jan 2024 08:05:05 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:15 +0000
Received: from localhost ([127.0.0.1]:34918 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcJ-0007r2-Dn
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:15 -0500
Received: from 1.mo550.mail-out.ovh.net ([178.32.127.22]:47067)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcF-0007pw-IS
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:12 -0500
Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.176.110])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id 293C127A5C
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:04 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-hh2pp (unknown [10.111.174.181])
by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DD8041FEAF;
Mon, 8 Jan 2024 08:04:03 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.103])
by ghost-submission-6684bf9d7b-hh2pp with ESMTPSA
id T0CyMHOsm2UClgAAmE5VRA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:03 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-103G005d5bbb359-f9b1-4c81-9621-a177f497b433,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:39 +0100
Message-ID: <20240108080350.1665-7-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12426557271874659042
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 17
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 2b17cee37b..4ee951e70f 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 <glv@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2022 Pierre Neidhardt <mail@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 08/48] build-system: cargo: Redefine cargo-build and cargo-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:06 +0000
Resent-Message-ID: <handler.68315.B68315.170470105630213 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105630213
(code B ref 68315); Mon, 08 Jan 2024 08:05:06 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:16 +0000
Received: from localhost ([127.0.0.1]:34920 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcJ-0007r9-R8
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:16 -0500
Received: from 6.mo584.mail-out.ovh.net ([188.165.36.253]:51165)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcG-0007qI-SU
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:14 -0500
Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.25.249])
by mo584.mail-out.ovh.net (Postfix) with ESMTP id 33CC5290DD
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:05 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-6vv46 (unknown [10.108.2.220])
by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E224C1FEB5;
Mon, 8 Jan 2024 08:04:04 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.95])
by ghost-submission-6684bf9d7b-6vv46 with ESMTPSA
id dwdUM3Ssm2UXCwAAnq3mBQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:04 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-95G001134795f7-db16-469b-a43a-68fba6414f09,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:40 +0100
Message-ID: <20240108080350.1665-8-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12426838750817608418
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 c029cc1dda..8576aeaf59 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@HIDDEN>
;;; Copyright © 2020 Jakub Kądziołka <kuba@HIDDEN>
;;; Copyright © 2021 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -126,11 +127,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
@@ -186,14 +184,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 09/48] build-system: chicken: Redefine chicken-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:07 +0000
Resent-Message-ID: <handler.68315.B68315.170470105630221 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105630221
(code B ref 68315); Mon, 08 Jan 2024 08:05:07 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:16 +0000
Received: from localhost ([127.0.0.1]:34923 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcK-0007rG-7s
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:16 -0500
Received: from 2.mo582.mail-out.ovh.net ([46.105.76.65]:47841)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcH-0007qP-DG
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:14 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.25.152])
by mo582.mail-out.ovh.net (Postfix) with ESMTP id ECA1529145
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:05 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-qhskr (unknown [10.110.178.210])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8AE4C1FEEE;
Mon, 8 Jan 2024 08:04:05 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.101])
by ghost-submission-6684bf9d7b-qhskr with ESMTPSA
id kzUIJHWsm2XAIQQAGMzzyA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:05 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G0043844450d-c16d-4058-92e3-32cd80bc49bb,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:41 +0100
Message-ID: <20240108080350.1665-9-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12426838748513034978
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 17
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 9f518e66e6..d305db8e7f 100644
--- a/guix/build-system/chicken.scm
+++ b/guix/build-system/chicken.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2020 raingloom <raingloom@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Xinglu Chen <public@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 10/48] build-system: clojure: Redefine clojure-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:08 +0000
Resent-Message-ID: <handler.68315.B68315.170470105730233 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470105730233
(code B ref 68315); Mon, 08 Jan 2024 08:05:08 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:17 +0000
Received: from localhost ([127.0.0.1]:34926 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcK-0007rO-Kn
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:17 -0500
Received: from 14.mo583.mail-out.ovh.net ([188.165.51.82]:55611)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcI-0007qW-3m
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:14 -0500
Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.17.3])
by mo583.mail-out.ovh.net (Postfix) with ESMTP id 93E87271D6
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:06 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-779cq (unknown [10.110.168.127])
by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 490C51FEAA;
Mon, 8 Jan 2024 08:04:06 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.95])
by ghost-submission-6684bf9d7b-779cq with ESMTPSA
id cZZoEHasm2VUAwAA0YpIfA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:06 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-95G0014a9867a8-c502-4feb-9ba7-91d20e7b1537,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:42 +0100
Message-ID: <20240108080350.1665-10-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12427120222675460834
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <alexvong1995@HIDDEN>
;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 12/48] build-system: composer: Redefine composer-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:08 +0000
Resent-Message-ID: <handler.68315.B68315.170470106430285 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470106430285
(code B ref 68315); Mon, 08 Jan 2024 08:05:08 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:24 +0000
Received: from localhost ([127.0.0.1]:34932 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcS-0007sN-4b
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:24 -0500
Received: from 15.mo550.mail-out.ovh.net ([188.165.38.232]:59429)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcK-0007qy-0w
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:16 -0500
Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.25.248])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id B5CA5278F9
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:08 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-tglz6 (unknown [10.110.113.89])
by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 527281FE03;
Mon, 8 Jan 2024 08:04:08 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.110])
by ghost-submission-6684bf9d7b-tglz6 with ESMTPSA
id rZW3Fnism2UpAwAAP3B3dg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:08 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-110S004b96f7cd9-9379-4ca8-871a-cb3fa19d5271,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:44 +0100
Message-ID: <20240108080350.1665-12-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12427683172707721954
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 2ad7bbb36a..f8fafe778e 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 <julien@HIDDEN>
+;;; Copyright © 2023-2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 11/48] build-system: cmake: Redefine cmake-build and cmake-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:09 +0000
Resent-Message-ID: <handler.68315.B68315.170470106530294 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470106530294
(code B ref 68315); Mon, 08 Jan 2024 08:05:09 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:25 +0000
Received: from localhost ([127.0.0.1]:34934 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcS-0007sQ-EW
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:25 -0500
Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:40989)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcK-0007qf-3T
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:17 -0500
Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.2.160])
by mo560.mail-out.ovh.net (Postfix) with ESMTP id C377926DA5
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:07 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-jj4qn (unknown [10.110.178.25])
by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 75C581FD5B;
Mon, 8 Jan 2024 08:04:07 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.95])
by ghost-submission-6684bf9d7b-jj4qn with ESMTPSA
id SAE6FHesm2WsAQAAm+NeBQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:07 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-95G001508f579d-a904-4ca3-982e-73157a68ae5a,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:43 +0100
Message-ID: <20240108080350.1665-11-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12427401699507626722
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/cmake.scm
(cmake-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I0c3ceb08391a38c52521416093d2c4b2ae869165
---
guix/build-system/cmake.scm | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index aa187c9844..39302b3a69 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2013 Cyril Roelandt <tipecaml@HIDDEN>
;;; Copyright © 2017 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright © 2020 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -119,7 +120,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))
@@ -151,15 +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?
- #:disallowed-references disallowed-references
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
;;;
@@ -243,14 +237,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?
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define cmake-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 13/48] build-system: copy: Redefine copy-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:09 +0000
Resent-Message-ID: <handler.68315.B68315.170470106530309 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470106530309
(code B ref 68315); Mon, 08 Jan 2024 08:05:09 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:25 +0000
Received: from localhost ([127.0.0.1]:34937 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcT-0007sZ-2p
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:25 -0500
Received: from 4.mo575.mail-out.ovh.net ([46.105.59.63]:52519)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcM-0007rn-QK
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:19 -0500
Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.140.229])
by mo575.mail-out.ovh.net (Postfix) with ESMTP id 7AEDA27024
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:11 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-fdn7w (unknown [10.110.96.102])
by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2F1631FEA1;
Mon, 8 Jan 2024 08:04:11 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.103])
by ghost-submission-6684bf9d7b-fdn7w with ESMTPSA
id ya32CHusm2XhAQAAWGpxOQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:11 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-103G005d3e53aae-4894-4466-b055-71548fcf2708,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:45 +0100
Message-ID: <20240108080350.1665-13-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12428527600413500130
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 17
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 d58931b33c..e6a1cf36f7 100644
--- a/guix/build-system/copy.scm
+++ b/guix/build-system/copy.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@HIDDEN>
;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 15/48] build-system: dune: Redefine dune-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:09 +0000
Resent-Message-ID: <handler.68315.B68315.170470106630322 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470106630322
(code B ref 68315); Mon, 08 Jan 2024 08:05:09 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:26 +0000
Received: from localhost ([127.0.0.1]:34940 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcT-0007so-Pj
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:26 -0500
Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:36093)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcQ-0007s0-Dy
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:23 -0500
Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.17.89])
by mo560.mail-out.ovh.net (Postfix) with ESMTP id 9F099273B5
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:15 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-zpmqz (unknown [10.110.113.120])
by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 603291FEA6;
Mon, 8 Jan 2024 08:04:15 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.106])
by ghost-submission-6684bf9d7b-zpmqz with ESMTPSA
id m0INFX+sm2XvGAgAJbutug
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:15 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-106R0066da660ca-d22d-4c05-a49f-eda32bb991a9,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:47 +0100
Message-ID: <20240108080350.1665-15-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12429653498244096738
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <donttrustben@HIDDEN>
;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 pukkamustard <pukkamustard@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 16/48] build-system: elm: Redefine elm-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:10 +0000
Resent-Message-ID: <handler.68315.B68315.170470106730329 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470106730329
(code B ref 68315); Mon, 08 Jan 2024 08:05:10 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:27 +0000
Received: from localhost ([127.0.0.1]:34943 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcU-0007t0-Aa
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:26 -0500
Received: from 6.mo576.mail-out.ovh.net ([46.105.50.107]:36899)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcQ-0007s1-SZ
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:23 -0500
Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.139.40])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id 358C82FBF4
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:16 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-sxmkg (unknown [10.110.96.50])
by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EE87D1FDB2;
Mon, 8 Jan 2024 08:04:15 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-sxmkg with ESMTPSA
id TkoXOX+sm2XNCwAA7T9DbA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:15 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G006f8c52773-c8f3-4790-9c14-444b58ba5f18,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:48 +0100
Message-ID: <20240108080350.1665-16-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12429934974694253282
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 f5321f811b..b8bb4d6aec 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 <philip@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 14/48] build-system: dub: Redefine dub-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:10 +0000
Resent-Message-ID: <handler.68315.B68315.170470107230375 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470107230375
(code B ref 68315); Mon, 08 Jan 2024 08:05:10 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:32 +0000
Received: from localhost ([127.0.0.1]:34950 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcY-0007tk-T3
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:31 -0500
Received: from 6.mo550.mail-out.ovh.net ([46.105.43.205]:35373)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcQ-0007rz-V7
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:23 -0500
Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.25.209])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id A04F827D0D
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:14 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-xspbj (unknown [10.110.96.89])
by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5AF681FEAB;
Mon, 8 Jan 2024 08:04:14 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.108])
by ghost-submission-6684bf9d7b-xspbj with ESMTPSA
id LGFBE36sm2WeAQAAikbXRw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:14 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-108S0023a502e11-c2a1-4399-9283-7167e5a46c08,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:46 +0100
Message-ID: <20240108080350.1665-14-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12429372024434647778
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 951c084398..bf42686e18 100644
--- a/guix/build-system/dub.scm
+++ b/guix/build-system/dub.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2013 Nikita Karetnikov <nikita@HIDDEN>
;;; Copyright © 2016 David Craven <david@HIDDEN>
;;; Copyright © 2016 Danny Milosavljevic <dannym@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 17/48] build-system: emacs: Redefine emacs-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:11 +0000
Resent-Message-ID: <handler.68315.B68315.170470107230384 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470107230384
(code B ref 68315); Mon, 08 Jan 2024 08:05:11 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:32 +0000
Received: from localhost ([127.0.0.1]:34952 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcZ-0007ts-TQ
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:32 -0500
Received: from 8.mo582.mail-out.ovh.net ([178.33.42.204]:58557)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcS-0007sE-CX
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:25 -0500
Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.148.49])
by mo582.mail-out.ovh.net (Postfix) with ESMTP id 06D6329135
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:16 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-sxmkg (unknown [10.110.168.164])
by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B298C1FE60;
Mon, 8 Jan 2024 08:04:16 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.107])
by ghost-submission-6684bf9d7b-sxmkg with ESMTPSA
id jtPpKICsm2XQCwAA7T9DbA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:16 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-107S001b6cde57c-463e-4edf-a278-9d4a5931bab5,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:49 +0100
Message-ID: <20240108080350.1665-17-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12429934974644576994
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/emacs.scm
(emacs-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I89cc8c1171eef7c5e02e35df5e1298ce3813c1b5
---
guix/build-system/emacs.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm
index ebf97a5344..c16771ad76 100644
--- a/guix/build-system/emacs.scm
+++ b/guix/build-system/emacs.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <beffa@HIDDEN>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -116,11 +117,8 @@ (define builder
search-paths))
#:inputs #$(input-tuples->gexp inputs)))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define emacs-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 18/48] build-system: font: Redefine font-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:11 +0000
Resent-Message-ID: <handler.68315.B68315.170470107230391 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470107230391
(code B ref 68315); Mon, 08 Jan 2024 08:05:11 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:32 +0000
Received: from localhost ([127.0.0.1]:34954 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkca-0007u1-CO
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:32 -0500
Received: from 13.mo584.mail-out.ovh.net ([178.33.251.8]:40707)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcT-0007sO-18
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:26 -0500
Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.140.215])
by mo584.mail-out.ovh.net (Postfix) with ESMTP id BEC0427022
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:17 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-2svv6 (unknown [10.108.17.215])
by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 870451FEAE;
Mon, 8 Jan 2024 08:04:17 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.107])
by ghost-submission-6684bf9d7b-2svv6 with ESMTPSA
id veTqHoGsm2W3ZyUAlOvgGg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:17 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-107S001c8449476-b46f-441a-80f8-b3e5812ad1e6,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:50 +0100
Message-ID: <20240108080350.1665-18-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12430216448256959202
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 c57c304f52..461f8cdd82 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 <arunisaac@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -106,13 +107,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 19/48] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:11 +0000
Resent-Message-ID: <handler.68315.B68315.170470107330400 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470107330400
(code B ref 68315); Mon, 08 Jan 2024 08:05:11 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:33 +0000
Received: from localhost ([127.0.0.1]:34956 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkca-0007u8-PX
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:33 -0500
Received: from 14.mo584.mail-out.ovh.net ([46.105.40.29]:43965)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcT-0007sX-Rv
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:26 -0500
Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.25.209])
by mo584.mail-out.ovh.net (Postfix) with ESMTP id 7139229373
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:18 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-fdn7w (unknown [10.110.96.92])
by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 37B001FD62;
Mon, 8 Jan 2024 08:04:18 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.101])
by ghost-submission-6684bf9d7b-fdn7w with ESMTPSA
id tLuQDIKsm2X0AQAAWGpxOQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:18 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G0049fb9ddee-b7a3-4767-81a4-19bd8ed8db17,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:51 +0100
Message-ID: <20240108080350.1665-19-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12430497924810597090
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 726d19efad..90da8d28f0 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)))
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 20/48] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:12 +0000
Resent-Message-ID: <handler.68315.B68315.170470107430412 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470107430412
(code B ref 68315); Mon, 08 Jan 2024 08:05:12 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:34 +0000
Received: from localhost ([127.0.0.1]:34958 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcb-0007uH-7j
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:33 -0500
Received: from 1.mo575.mail-out.ovh.net ([46.105.41.146]:41895)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcU-0007sm-8b
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:27 -0500
Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.17.89])
by mo575.mail-out.ovh.net (Postfix) with ESMTP id 1DD4927783
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:19 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-zm744 (unknown [10.110.96.193])
by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B6EA81FE53;
Mon, 8 Jan 2024 08:04:18 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-zm744 with ESMTPSA
id /JUzMoKsm2UmjDAA2Lfe6g
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:18 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G006ce42c3d9-f2fd-493b-ae29-ffd0a8947c6f,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:52 +0100
Message-ID: <20240108080350.1665-20-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12430497922373116642
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 90da8d28f0..696b9b1ea8 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 <tipecaml@HIDDEN>
;;; Copyright © 2014 Federico Beffa <beffa@HIDDEN>
;;; Copyright © 2021 Maxime Devos <maximedevos@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:13 +0000
Resent-Message-ID: <handler.68315.B68315.170470107430426 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470107430426
(code B ref 68315); Mon, 08 Jan 2024 08:05:13 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:34 +0000
Received: from localhost ([127.0.0.1]:34961 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcb-0007uT-QN
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:34 -0500
Received: from 5.mo576.mail-out.ovh.net ([46.105.43.105]:38613)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcV-0007t7-91
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:28 -0500
Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.2.72])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id 065522FC27
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:20 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-n7x8q (unknown [10.110.168.38])
by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A7EB01FD5B;
Mon, 8 Jan 2024 08:04:19 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.107])
by ghost-submission-6684bf9d7b-n7x8q with ESMTPSA
id HcKVJoOsm2WmAQAAxpI9mw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:19 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-107S0013721d57c-8756-485a-a951-f12a49366416,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:53 +0100
Message-ID: <20240108080350.1665-21-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12430779398944580322
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpeegnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 0934fded07..6e8f3c8153 100644
--- a/guix/build-system/go.scm
+++ b/guix/build-system/go.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021-2022 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021, 2023 Efraim Flashner <efraim@HIDDEN>
;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -217,11 +218,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
@@ -257,7 +255,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))
@@ -289,14 +287,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 22/48] build-system: guile: Redefine guile-build and guile-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:13 +0000
Resent-Message-ID: <handler.68315.B68315.170470107530438 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470107530438
(code B ref 68315); Mon, 08 Jan 2024 08:05:13 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:35 +0000
Received: from localhost ([127.0.0.1]:34964 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcc-0007uh-Bg
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:34 -0500
Received: from 14.mo582.mail-out.ovh.net ([46.105.56.113]:55119)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcW-0007tO-6W
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:29 -0500
Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.148.49])
by mo582.mail-out.ovh.net (Postfix) with ESMTP id E1F1E2910A
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:20 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-pkj55 (unknown [10.110.168.242])
by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B90631FEA3;
Mon, 8 Jan 2024 08:04:20 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.97])
by ghost-submission-6684bf9d7b-pkj55 with ESMTPSA
id kCi2K4Ssm2U1LgAAAb9A5g
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:20 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-97G002bbfef7d5-4da2-4d79-bc83-57d2333f7af2,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:54 +0100
Message-ID: <20240108080350.1665-22-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12431060874453050082
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 bd3bb1c870..1ba99308aa 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 <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 23/48] build-system: haskell: Redefine haskell-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:14 +0000
Resent-Message-ID: <handler.68315.B68315.170470108130486 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108130486
(code B ref 68315); Mon, 08 Jan 2024 08:05:14 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:41 +0000
Received: from localhost ([127.0.0.1]:34972 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkci-0007vb-V5
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:41 -0500
Received: from 6.mo581.mail-out.ovh.net ([188.165.39.218]:57935)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcY-0007ti-MY
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:31 -0500
Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.9.32])
by mo581.mail-out.ovh.net (Postfix) with ESMTP id 25F952660B
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:21 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-gc8lz (unknown [10.110.168.168])
by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 96A9D1FEA6;
Mon, 8 Jan 2024 08:04:21 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-gc8lz with ESMTPSA
id V4RIHYWsm2UmIgAAqBvOJw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:21 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G006911c0e12-1ed8-4e5d-bcf8-ac245d2fd3be,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:55 +0100
Message-ID: <20240108080350.1665-23-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12431342350645584610
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 17
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 f8568e33db..31561654d8 100644
--- a/guix/build-system/haskell.scm
+++ b/guix/build-system/haskell.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Xinglu Chen <public@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 24/48] build-system: julia: Redefine julia-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:14 +0000
Resent-Message-ID: <handler.68315.B68315.170470108230500 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108230500
(code B ref 68315); Mon, 08 Jan 2024 08:05:14 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:42 +0000
Received: from localhost ([127.0.0.1]:34974 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcj-0007vf-Dj
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:41 -0500
Received: from 9.mo583.mail-out.ovh.net ([178.32.96.204]:38863)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcX-0007tY-RS
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:33 -0500
Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.25.74])
by mo583.mail-out.ovh.net (Postfix) with ESMTP id 798D427DC5
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:22 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-d7524 (unknown [10.110.96.89])
by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4E7F51FE12;
Mon, 8 Jan 2024 08:04:22 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.101])
by ghost-submission-6684bf9d7b-d7524 with ESMTPSA
id 8RTuEYasm2UsHgAAzUkgWw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:22 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G00414b9222f-4645-47ac-a29d-7577fe4b336f,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:56 +0100
Message-ID: <20240108080350.1665-24-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12431623825180582626
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpeeinecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 b5521e38e4..6cbd2c8028 100644
--- a/guix/build-system/julia.scm
+++ b/guix/build-system/julia.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@HIDDEN>
;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@HIDDEN>
;;; Copyright © 2022 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 25/48] build-system: linux-module: Redefine linux-module-build functions.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:15 +0000
Resent-Message-ID: <handler.68315.B68315.170470108230510 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108230510
(code B ref 68315); Mon, 08 Jan 2024 08:05:15 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:42 +0000
Received: from localhost ([127.0.0.1]:34976 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcj-0007vs-UE
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:42 -0500
Received: from 4.mo584.mail-out.ovh.net ([178.32.98.131]:51161)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcb-0007tz-4N
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:34 -0500
Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.2.89])
by mo584.mail-out.ovh.net (Postfix) with ESMTP id C10D42938C
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:25 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-rr9q8 (unknown [10.110.168.247])
by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 769B21FEAA;
Mon, 8 Jan 2024 08:04:25 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.110])
by ghost-submission-6684bf9d7b-rr9q8 with ESMTPSA
id J+AyGomsm2VVAwAA5xo7qg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:25 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-110S004273009e0-a371-4a44-9cf9-7d52087cf098,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:57 +0100
Message-ID: <20240108080350.1665-25-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12432468249777464034
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpeegnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 e46195b53c..87aa485bc1 100644
--- a/guix/build-system/linux-module.scm
+++ b/guix/build-system/linux-module.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -189,12 +190,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
@@ -249,12 +246,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 26/48] build-system: maven: Redefine maven-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:15 +0000
Resent-Message-ID: <handler.68315.B68315.170470108230517 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108230517
(code B ref 68315); Mon, 08 Jan 2024 08:05:15 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:42 +0000
Received: from localhost ([127.0.0.1]:34978 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkck-0007w3-BJ
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:42 -0500
Received: from 3.mo581.mail-out.ovh.net ([46.105.34.113]:60867)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcb-0007uF-RI
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:34 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.148])
by mo581.mail-out.ovh.net (Postfix) with ESMTP id 9228426AD5
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:26 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-ctm4h (unknown [10.110.178.103])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 32A9D1FEE3;
Mon, 8 Jan 2024 08:04:26 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.97])
by ghost-submission-6684bf9d7b-ctm4h with ESMTPSA
id uzyLDoqsm2VtAwAAr7VpSA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:26 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-97G0020fa53591-e7ea-4ae1-a7d4-855ee36ba3dc,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:58 +0100
Message-ID: <20240108080350.1665-26-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12432749725448463074
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 4bbeaed6a4..22e86eb78b 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 <julien@HIDDEN>
;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 27/48] build-system: meson: Redefine meson-build and meson-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:15 +0000
Resent-Message-ID: <handler.68315.B68315.170470108330526 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108330526
(code B ref 68315); Mon, 08 Jan 2024 08:05:15 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:43 +0000
Received: from localhost ([127.0.0.1]:34980 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkck-0007wA-O0
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:43 -0500
Received: from 3.mo550.mail-out.ovh.net ([46.105.60.232]:35917)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcc-0007uZ-Om
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:35 -0500
Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.2.160])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id 790122A058
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:27 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-tglz6 (unknown [10.110.178.62])
by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0C4911FEA9;
Mon, 8 Jan 2024 08:04:27 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.108])
by ghost-submission-6684bf9d7b-tglz6 with ESMTPSA
id G+pWB4usm2VOAwAAP3B3dg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:27 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-108S0028d0027bb-44d7-4af1-9c51-3879e14b9417,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:02:59 +0100
Message-ID: <20240108080350.1665-27-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12433031199387869922
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 bf9ca15ecc..410d981bf0 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Maxime Devos <maximedevos@HIDDEN>
;;; Copyright © 2022 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -237,16 +238,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
@@ -350,16 +343,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 28/48] build-system: minify: Redefine minify-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:16 +0000
Resent-Message-ID: <handler.68315.B68315.170470108330533 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108330533
(code B ref 68315); Mon, 08 Jan 2024 08:05:16 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:43 +0000
Received: from localhost ([127.0.0.1]:34982 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcl-0007wJ-7A
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:43 -0500
Received: from 6.mo560.mail-out.ovh.net ([87.98.165.38]:56277)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcd-0007uz-T3
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:36 -0500
Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.25.249])
by mo560.mail-out.ovh.net (Postfix) with ESMTP id A29B6279A1
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:28 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-wj7t8 (unknown [10.110.168.31])
by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 544C81FEAB;
Mon, 8 Jan 2024 08:04:28 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.102])
by ghost-submission-6684bf9d7b-wj7t8 with ESMTPSA
id cI9nDYysm2XzIQAAa6Wlyg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:28 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-102R00497074408-0ae3-43f1-b41b-84c1baa26b07,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:00 +0100
Message-ID: <20240108080350.1665-28-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12433312673429250786
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/minify.scm
(minify-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: Ib009adcec6791d7145ce0d822745495dad9cf6e5
---
guix/build-system/minify.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm
index b377b506b5..a7536520e7 100644
--- a/guix/build-system/minify.scm
+++ b/guix/build-system/minify.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2023 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -97,11 +98,8 @@ (define builder
search-paths))
#:inputs #$(input-tuples->gexp inputs)))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define minify-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 29/48] build-system: mix: Redefine mix-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:16 +0000
Resent-Message-ID: <handler.68315.B68315.170470108330540 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108330540
(code B ref 68315); Mon, 08 Jan 2024 08:05:16 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:43 +0000
Received: from localhost ([127.0.0.1]:34984 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcl-0007wQ-HH
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:43 -0500
Received: from 17.mo581.mail-out.ovh.net ([188.165.35.227]:60439)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkce-0007v8-JN
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:37 -0500
Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.139.43])
by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4BD29264ED
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:29 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-2zn7b (unknown [10.110.96.131])
by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1A9611FD34;
Mon, 8 Jan 2024 08:04:29 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.101])
by ghost-submission-6684bf9d7b-2zn7b with ESMTPSA
id t/X1A42sm2Xv0AAA0aFprA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:29 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G004eb5cffd1-74f2-4cba-b4f0-8173ef08e6ee,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:01 +0100
Message-ID: <20240108080350.1665-29-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12433594146998575842
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 1b04053d70..5e1ac43578 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 <contact@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -130,15 +131,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 30/48] build-system: node: Redefine node-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:17 +0000
Resent-Message-ID: <handler.68315.B68315.170470108430550 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108430550
(code B ref 68315); Mon, 08 Jan 2024 08:05:17 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:44 +0000
Received: from localhost ([127.0.0.1]:34986 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcl-0007wX-Rd
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:44 -0500
Received: from 4.mo561.mail-out.ovh.net ([178.33.46.10]:40707)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcf-0007vF-Q8
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:38 -0500
Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.49])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4D5F029793
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:30 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-lpzrr (unknown [10.110.113.85])
by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E523F1FEA2;
Mon, 8 Jan 2024 08:04:29 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.108])
by ghost-submission-6684bf9d7b-lpzrr with ESMTPSA
id T1jbNI2sm2XNAQAAUHK4KQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:29 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-108S0025a871e4b-e2b4-482a-9dcb-8020362faeed,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:02 +0100
Message-ID: <20240108080350.1665-30-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12433875621993571042
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 3f73390809..d17a82b7b9 100644
--- a/guix/build-system/node.scm
+++ b/guix/build-system/node.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;; Copyright © 2021 Philip McGrath <philip@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 31/48] build-system: ocaml: Redefine ocaml-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:17 +0000
Resent-Message-ID: <handler.68315.B68315.170470108530556 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470108530556
(code B ref 68315); Mon, 08 Jan 2024 08:05:17 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:45 +0000
Received: from localhost ([127.0.0.1]:34988 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcm-0007wf-7Y
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:44 -0500
Received: from 5.mo576.mail-out.ovh.net ([46.105.43.105]:44559)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkch-0007vS-Sl
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:40 -0500
Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.140.229])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id 2442A2FBFD
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:33 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-p2h27 (unknown [10.110.96.35])
by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id ED2811FD1E;
Mon, 8 Jan 2024 08:04:32 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.96])
by ghost-submission-6684bf9d7b-p2h27 with ESMTPSA
id x7loOJCsm2UkIgAAW2GO0Q
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:32 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-96R001f7b04d88-4887-4647-bbbf-b18ab839efec,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:03 +0100
Message-ID: <20240108080350.1665-31-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12434720048627245794
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedugeelfeekhedugedvieffleekgeffiefhkeejudelveeuuefhheevtefghedtheenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuthdpughkihhmpehprghssh
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 582d00b4cd..1872033e91 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@HIDDEN>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@HIDDEN>
;;; Copyright © 2021-2022 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 32/48] build-system: perl: Redefine perl-build and perl-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:17 +0000
Resent-Message-ID: <handler.68315.B68315.170470109130600 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109130600
(code B ref 68315); Mon, 08 Jan 2024 08:05:17 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:51 +0000
Received: from localhost ([127.0.0.1]:34995 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcs-0007xS-Rf
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:51 -0500
Received: from 6.mo584.mail-out.ovh.net ([188.165.36.253]:54463)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkci-0007vU-JO
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:41 -0500
Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.9.148])
by mo584.mail-out.ovh.net (Postfix) with ESMTP id BC7DC290C0
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:33 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-pkj55 (unknown [10.110.96.146])
by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8DADB1FE99;
Mon, 8 Jan 2024 08:04:33 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-pkj55 with ESMTPSA
id IVE8IZGsm2VYLgAAAb9A5g
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:33 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G0062b0dc868-9299-4a0e-98ae-4bb7b14cc9f1,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:04 +0100
Message-ID: <20240108080350.1665-32-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12434720046165975778
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 7c6deb34bf..4de0da15a5 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 <ludo@HIDDEN>
;;; Copyright © 2022 Maxime Devos <maximedevos@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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))
@@ -144,14 +145,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
@@ -207,13 +202,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 33/48] build-system: pyproject: Redefine pyproject-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:18 +0000
Resent-Message-ID: <handler.68315.B68315.170470109130608 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109130608
(code B ref 68315); Mon, 08 Jan 2024 08:05:18 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:51 +0000
Received: from localhost ([127.0.0.1]:34997 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkct-0007xV-Cx
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:51 -0500
Received: from 4.mo584.mail-out.ovh.net ([178.32.98.131]:42441)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcm-0007wg-FN
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:45 -0500
Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.43])
by mo584.mail-out.ovh.net (Postfix) with ESMTP id AFA83293D7
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:36 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-gtjkq (unknown [10.109.139.190])
by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 686BC1FD5E;
Mon, 8 Jan 2024 08:04:36 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-gtjkq with ESMTPSA
id Zb1TF5Ssm2X4oB4AFX/BDw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:36 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G006230cb4d8-7e88-4762-97a1-1ed207ec78da,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:05 +0100
Message-ID: <20240108080350.1665-33-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12435564474315301602
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpeeinecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/pyproject.scm
(pyproject-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: Ia26001291b472c69c65647d8bddd1199f0ddc483
---
guix/build-system/pyproject.scm | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm
index 2a2c3af3f3..c0404d0842 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 <lars@HIDDEN>
;;; Copyright © 2022 Marius Bakke <marius@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -100,7 +101,7 @@ (define* (pyproject-build name inputs
(modules '((guix build pyproject-build-system)
(guix build utils))))
"Build SOURCE using PYTHON, and with INPUTS."
- (define build
+ (define builder
(with-imported-modules imported-modules
#~(begin
(use-modules #$@(sexp->gexp modules))
@@ -124,14 +125,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)))
+ (mbegin %store-monad
+ (return builder)))
(define pyproject-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 34/48] build-system: python: Redefine python-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:18 +0000
Resent-Message-ID: <handler.68315.B68315.170470109230616 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109230616
(code B ref 68315); Mon, 08 Jan 2024 08:05:18 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:52 +0000
Received: from localhost ([127.0.0.1]:34999 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkct-0007xd-QO
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:52 -0500
Received: from 3.mo550.mail-out.ovh.net ([46.105.60.232]:51341)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcm-0007wd-7H
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:45 -0500
Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.140.88])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id 773FF26E47
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:37 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-qlq6c (unknown [10.110.96.204])
by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3B45C1FE86;
Mon, 8 Jan 2024 08:04:37 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.96])
by ghost-submission-6684bf9d7b-qlq6c with ESMTPSA
id 3jJSB5Wsm2UfgQEAiXcEww
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:37 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-96R00163148b5b-8508-4b5a-b54d-aad5d49ddcbb,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:06 +0100
Message-ID: <20240108080350.1665-34-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12435845947312366306
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/python.scm
(python-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I1d270fa64192394072279f73ae0d77877d41f01c
---
guix/build-system/python.scm | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index cca009fb28..365d216592 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@HIDDEN>
;;; Copyright © 2013 Nikita Karetnikov <nikita@HIDDEN>
;;; Copyright © 2021 Lars-Dominik Braun <lars@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -182,7 +183,7 @@ (define* (python-build name inputs
(guix build utils))))
"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))
@@ -205,13 +206,8 @@ (define build
#: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)))
+ (mbegin %store-monad
+ (return builder)))
(define python-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 35/48] build-system: qt: Redefine qt-build and qt-cross-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:19 +0000
Resent-Message-ID: <handler.68315.B68315.170470109230624 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109230624
(code B ref 68315); Mon, 08 Jan 2024 08:05:19 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:52 +0000
Received: from localhost ([127.0.0.1]:35001 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcu-0007xl-6x
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:52 -0500
Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:54693)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcp-0007x7-Py
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:48 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.140.229])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id 920802A097
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:40 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-qxqkr (unknown [10.111.182.85])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 402091FECC;
Mon, 8 Jan 2024 08:04:40 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.97])
by ghost-submission-6684bf9d7b-qxqkr with ESMTPSA
id t78ODZism2W4KgAA75Iixg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:40 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-97G0024da5be47-95d9-413e-820d-1d7c18cfb29f,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:07 +0100
Message-ID: <20240108080350.1665-35-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12436690372091372258
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 978aed0fc1..27296a0f60 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2019 Hartmut Goebel <h.goebel@HIDDEN>
;;; Copyright © 2020 Jakub Kądziołka <kuba@HIDDEN>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -176,12 +177,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)))
+ (mbegin %store-monad
+ (return builder)))
;;;
@@ -263,12 +260,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)))
+ (mbegin %store-monad
+ (return builder)))
(define qt-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 36/48] build-system: r: Redefine r-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:19 +0000
Resent-Message-ID: <handler.68315.B68315.170470109330638 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109330638
(code B ref 68315); Mon, 08 Jan 2024 08:05:19 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:53 +0000
Received: from localhost ([127.0.0.1]:35004 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcu-0007xt-Kx
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:53 -0500
Received: from 4.mo560.mail-out.ovh.net ([87.98.172.75]:53695)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcq-0007x9-Q9
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:49 -0500
Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.17.95])
by mo560.mail-out.ovh.net (Postfix) with ESMTP id 3A9FC26844
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:41 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-m5qnx (unknown [10.110.96.89])
by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0CA141FEB0;
Mon, 8 Jan 2024 08:04:41 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.95])
by ghost-submission-6684bf9d7b-m5qnx with ESMTPSA
id 7uH6AZmsm2WCRgAAxu9BGQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:41 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-95G001f3888731-a98b-4611-a56e-6ca8a6651ee8,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:08 +0100
Message-ID: <20240108080350.1665-36-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12436971847857791714
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 7ab4db82b6..e6e3a99a8d 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-2023 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -135,12 +136,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 37/48] build-system: rakudo: Redefine rakudo-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:20 +0000
Resent-Message-ID: <handler.68315.B68315.170470109330644 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109330644
(code B ref 68315); Mon, 08 Jan 2024 08:05:20 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:53 +0000
Received: from localhost ([127.0.0.1]:35006 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkcv-0007y7-51
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:53 -0500
Received: from 9.mo561.mail-out.ovh.net ([87.98.184.141]:53383)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcr-0007xA-J4
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:50 -0500
Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.139.157])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id 1159B297FD
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:42 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-mc4sw (unknown [10.108.25.132])
by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B143C1FEAB;
Mon, 8 Jan 2024 08:04:41 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.101])
by ghost-submission-6684bf9d7b-mc4sw with ESMTPSA
id 2cqRL5msm2XWHQAAtpHgbA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:41 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G0049f18b2c3-a088-49df-9570-71716e6a248f,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:09 +0100
Message-ID: <20240108080350.1665-37-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12436971847341236962
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 3b30fdfd0e..9bcf178c29 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 <efraim@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 38/48] build-system: rebar: Redefine rebar-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:20 +0000
Resent-Message-ID: <handler.68315.B68315.170470109930685 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109930685
(code B ref 68315); Mon, 08 Jan 2024 08:05:20 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:59 +0000
Received: from localhost ([127.0.0.1]:35012 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd0-0007yo-Nf
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:59 -0500
Received: from 18.mo550.mail-out.ovh.net ([46.105.35.72]:50975)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcu-0007xb-A0
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:53 -0500
Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.9.101])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id 220892A089
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:45 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-tl55r (unknown [10.110.168.247])
by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A3BB01FEBB;
Mon, 8 Jan 2024 08:04:44 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.106])
by ghost-submission-6684bf9d7b-tl55r with ESMTPSA
id YtZRJZysm2UjPBYATTcdgg
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:44 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-106R0062548f4d6-b8f4-473f-92fd-ec072d8b1ac6,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:10 +0100
Message-ID: <20240108080350.1665-38-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12438097749862834914
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpeeknecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 de1294ec3f..8acaf49fc2 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 <rekado@HIDDEN>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 39/48] build-system: renpy: Redefine renpy-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:21 +0000
Resent-Message-ID: <handler.68315.B68315.170470109930694 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470109930694
(code B ref 68315); Mon, 08 Jan 2024 08:05:21 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:59 +0000
Received: from localhost ([127.0.0.1]:35015 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd1-0007ys-3n
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:59 -0500
Received: from 13.mo581.mail-out.ovh.net ([87.98.150.175]:41305)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcv-0007xs-Ka
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:54 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.2.89])
by mo581.mail-out.ovh.net (Postfix) with ESMTP id 0AE162772E
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:46 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-gtjkq (unknown [10.110.113.120])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A715B1FECC;
Mon, 8 Jan 2024 08:04:45 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.102])
by ghost-submission-6684bf9d7b-gtjkq with ESMTPSA
id QKl2Jp2sm2UGoR4AFX/BDw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:45 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-102R004b9873470-bd7d-43c7-a496-917811ce1420,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:11 +0100
Message-ID: <20240108080350.1665-39-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12438097746182660834
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpeegnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 3039e3c63b..4a20835ce8 100644
--- a/guix/build-system/renpy.scm
+++ b/guix/build-system/renpy.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2021 Leo Prikler <leo.prikler@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 40/48] build-system: ruby: Improve ruby-cross-build style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:21 +0000
Resent-Message-ID: <handler.68315.B68315.170470110030709 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110030709
(code B ref 68315); Mon, 08 Jan 2024 08:05:21 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:00 +0000
Received: from localhost ([127.0.0.1]:35017 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd1-0007z1-IJ
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:00 -0500
Received: from 1.mo582.mail-out.ovh.net ([46.105.56.136]:55117)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcy-0007yS-4Q
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:57 -0500
Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.9.148])
by mo582.mail-out.ovh.net (Postfix) with ESMTP id C30E42915B
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:48 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-g88tt (unknown [10.110.96.131])
by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 90A641FEAF;
Mon, 8 Jan 2024 08:04:48 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.98])
by ghost-submission-6684bf9d7b-g88tt with ESMTPSA
id IyD3IKCsm2XCKgAAk8/VOA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:48 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-98R002ddc29f94-91e0-4288-8e4a-2e87b25c8802,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:12 +0100
Message-ID: <20240108080350.1665-40-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12438942172637684450
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 a3793a9381..77f1312c13 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 <davet@HIDDEN>
;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 41/48] build-system: ruby: Redefine ruby-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:21 +0000
Resent-Message-ID: <handler.68315.B68315.170470110130717 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110130717
(code B ref 68315); Mon, 08 Jan 2024 08:05:21 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:01 +0000
Received: from localhost ([127.0.0.1]:35020 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd2-0007zG-Ig
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:00 -0500
Received: from 10.mo561.mail-out.ovh.net ([87.98.165.232]:55833)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcy-0007yU-QN
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:57 -0500
Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.176.72])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id A39D82976D
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:49 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-s2kmz (unknown [10.110.168.145])
by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2D30C1FEC8;
Mon, 8 Jan 2024 08:04:49 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.103])
by ghost-submission-6684bf9d7b-s2kmz with ESMTPSA
id sduLCaGsm2UHAgAAcWqa/g
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:49 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-103G005821a2ba4-ebdf-424e-8e42-7e62066ea37f,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:13 +0100
Message-ID: <20240108080350.1665-41-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12439223645776437986
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 77f1312c13..99c2f62101 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 42/48] build-system: scons: Redefine scons-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:22 +0000
Resent-Message-ID: <handler.68315.B68315.170470110530816 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110530816
(code B ref 68315); Mon, 08 Jan 2024 08:05:22 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:05 +0000
Received: from localhost ([127.0.0.1]:35031 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd7-00080p-20
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:05 -0500
Received: from 13.mo561.mail-out.ovh.net ([188.165.33.202]:48357)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkcz-0007yW-MR
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:58 -0500
Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.49])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id 6B3CC29812
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:50 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-zll2p (unknown [10.110.168.217])
by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1B4E51FEAF;
Mon, 8 Jan 2024 08:04:50 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.107])
by ghost-submission-6684bf9d7b-zll2p with ESMTPSA
id OnuvA6Ksm2XrCwAAna9euQ
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:50 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-107S001ba1b1793-4270-4fbe-a5c0-c24874798d00,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:14 +0100
Message-ID: <20240108080350.1665-42-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12439505122536973026
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedugeelfeekhedugedvieffleekgeffiefhkeejudelveeuuefhheevtefghedtheenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 046ddef740..8bf2e5ee2f 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 <arunisaac@HIDDEN>
;;; Copyright © 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -18,6 +19,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 43/48] build-system: texlive: Redefine texlive-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:22 +0000
Resent-Message-ID: <handler.68315.B68315.170470110630831 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110630831
(code B ref 68315); Mon, 08 Jan 2024 08:05:22 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:06 +0000
Received: from localhost ([127.0.0.1]:35034 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd7-00080y-Gi
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:06 -0500
Received: from 18.mo561.mail-out.ovh.net ([87.98.172.162]:44647)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkd0-0007yi-OH
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:04:59 -0500
Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.176.101])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id 8B71C297FF
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:51 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-k2mrz (unknown [10.110.178.32])
by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 409771FE75;
Mon, 8 Jan 2024 08:04:51 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.97])
by ghost-submission-6684bf9d7b-k2mrz with ESMTPSA
id VDOpDKOsm2UGngAAWDRaQw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:51 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-97G0023311a495-211f-46d3-8d71-c580f9336256,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:15 +0100
Message-ID: <20240108080350.1665-43-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12439786599361798882
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuthdpughkihhmpehprghssh
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/texlive.scm
(texlive-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I00cc4e5647eec7e5cd7103ccd9ca0beb21361b3a
---
guix/build-system/texlive.scm | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index 88372faa58..8f5966c5ae 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright © 2021-2022 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -178,14 +179,8 @@ (define builder
(map search-path-specification->sexp
search-paths)))))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:target #f
- #:graft? #f
- #:substitutable? substitutable?
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define texlive-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitter-build functions.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:23 +0000
Resent-Message-ID: <handler.68315.B68315.170470110630847 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110630847
(code B ref 68315); Mon, 08 Jan 2024 08:05:23 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:06 +0000
Received: from localhost ([127.0.0.1]:35037 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd8-00081E-5Z
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:06 -0500
Received: from 20.mo583.mail-out.ovh.net ([91.121.55.239]:53805)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkd1-0007yq-Ty
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:01 -0500
Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.2.251])
by mo583.mail-out.ovh.net (Postfix) with ESMTP id 6F08B28078
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:52 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-zfqj2 (unknown [10.110.178.2])
by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 351A71FEB7;
Mon, 8 Jan 2024 08:04:52 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-zfqj2 with ESMTPSA
id 9gyHBqSsm2UmIgAAa/2oSA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:52 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G006764d2d95-c8b3-46ac-b871-5c89412812ad,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:16 +0100
Message-ID: <20240108080350.1665-44-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12440068072054121186
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <pierre.langlois@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:23 +0000
Resent-Message-ID: <handler.68315.B68315.170470110730857 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110730857
(code B ref 68315); Mon, 08 Jan 2024 08:05:23 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:07 +0000
Received: from localhost ([127.0.0.1]:35039 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd8-00081S-Px
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:07 -0500
Received: from 20.mo561.mail-out.ovh.net ([178.33.47.94]:45411)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkd2-0007z9-LD
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:01 -0500
Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.139.157])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id 65F38297DE
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:53 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-gtjkq (unknown [10.111.174.111])
by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 03A921FE7A;
Mon, 8 Jan 2024 08:04:52 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.97])
by ghost-submission-6684bf9d7b-gtjkq with ESMTPSA
id 1nCHAaWsm2UVoR4AFX/BDw
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:53 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-97G002fc56a69b-8b9b-4dd4-9eff-ea47a1f7631c,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:17 +0100
Message-ID: <20240108080350.1665-45-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12440349548405580514
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <me@HIDDEN>
;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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)
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 46/48] build-system: waf: Improve waf-build style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:23 +0000
Resent-Message-ID: <handler.68315.B68315.170470110730870 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110730870
(code B ref 68315); Mon, 08 Jan 2024 08:05:23 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:07 +0000
Received: from localhost ([127.0.0.1]:35042 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd9-00081e-AC
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:07 -0500
Received: from 5.mo560.mail-out.ovh.net ([87.98.181.248]:60385)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkd3-0007zM-Hu
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:02 -0500
Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.17.93])
by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4C39A29B8D
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:54 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-r2jvz (unknown [10.110.113.27])
by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D8D071FE53;
Mon, 8 Jan 2024 08:04:53 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.110])
by ghost-submission-6684bf9d7b-r2jvz with ESMTPSA
id i88NOaWsm2VRIgAAWvdHZA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:53 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-110S004775deb82-6388-4926-af52-1d6a8ab2535a,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:18 +0100
Message-ID: <20240108080350.1665-46-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12440631022016455394
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpeejnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 91b3d0d100..696b6de39d 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 <rekado@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; 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)))
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 47/48] build-system: zig: Redefine zig-build.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:24 +0000
Resent-Message-ID: <handler.68315.B68315.170470110830882 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470110830882
(code B ref 68315); Mon, 08 Jan 2024 08:05:24 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:08 +0000
Received: from localhost ([127.0.0.1]:35045 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkd9-00081r-Qz
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:08 -0500
Received: from 3.mo575.mail-out.ovh.net ([46.105.58.60]:38361)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkd4-0007zq-S3
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:03 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.148.12])
by mo575.mail-out.ovh.net (Postfix) with ESMTP id 9D0EE29B2F
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:55 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-ctm4h (unknown [10.110.96.84])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 422A71FEE3;
Mon, 8 Jan 2024 08:04:55 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.109])
by ghost-submission-6684bf9d7b-ctm4h with ESMTPSA
id mudTEaesm2WnAwAAr7VpSA
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:55 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-109S003e23b27f4-1bc7-4ffa-90b8-fc55b7f0c770,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:19 +0100
Message-ID: <20240108080350.1665-47-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12440912498466808546
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 1fa4782a2e..57df84f029 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 <ekaitz@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -77,11 +78,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
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 08:05:24 +0000
Resent-Message-ID: <handler.68315.B68315.170470111330972 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170470111330972
(code B ref 68315); Mon, 08 Jan 2024 08:05:24 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:13 +0000
Received: from localhost ([127.0.0.1]:35059 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMkdF-00083T-9E
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:13 -0500
Received: from 6.mo561.mail-out.ovh.net ([188.165.43.173]:60657)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMkd5-0007zw-Eg
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 03:05:04 -0500
Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.176.72])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id 1EA3F297C4
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:56 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-zpmqz (unknown [10.110.168.247])
by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EDFAA1FEC4;
Mon, 8 Jan 2024 08:04:55 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
by ghost-submission-6684bf9d7b-zpmqz with ESMTPSA
id X1v5OKesm2UtGQgAJbutug
(envelope-from <ngraves@HIDDEN>); Mon, 08 Jan 2024 08:04:55 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G0067b431182-012c-4fb5-aeba-abbc9b444bd6,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 8 Jan 2024 09:03:20 +0100
Message-ID: <20240108080350.1665-48-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240108080350.1665-1-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 12441193974476759778
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedutdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/trivial.scm
(trivial-build): Monadic procedure returns a gexp instead of a derivation.
(trivial-cross-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I261d5d5ae027a174eafa972e4f598afdc394caa3
---
guix/build-system/trivial.scm | 41 ++++++++++++++---------------------
1 file changed, 16 insertions(+), 25 deletions(-)
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm
index e08884baf1..bc71c94132 100644
--- a/guix/build-system/trivial.scm
+++ b/guix/build-system/trivial.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2018, 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,18 +52,13 @@ (define* (trivial-build name inputs
search-paths allowed-references)
"Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
ignored."
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f))
- (builder -> (if (pair? builder)
- (sexp->gexp builder)
- builder)))
- (gexp->derivation name (with-build-variables inputs outputs builder)
- #:system system
- #:target #f
- #:graft? #f
- #:modules modules
- #:allowed-references allowed-references
- #:guile-for-build guile)))
+ (mlet* %store-monad ((builder -> (if (pair? builder)
+ (sexp->gexp builder)
+ builder)))
+ (return (with-imported-modules modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+ #$(with-build-variables inputs outputs builder))))))
(define* (trivial-cross-build name
#:key
@@ -73,21 +69,16 @@ (define* (trivial-cross-build name
allowed-references)
"Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
ignored."
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f))
- (builder -> (if (pair? builder)
+ (mlet* %store-monad ((builder -> (if (pair? builder)
(sexp->gexp builder)
builder)))
- (gexp->derivation name (with-build-variables
- (append build-inputs target-inputs host-inputs)
- outputs
- builder)
- #:system system
- #:target target
- #:graft? #f
- #:modules modules
- #:allowed-references allowed-references
- #:guile-for-build guile)))
+ (return (with-imported-modules modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+ #$(with-build-variables
+ (append build-inputs target-inputs host-inputs)
+ outputs
+ builder))))))
(define trivial-build-system
(build-system
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jan 2024 22:51:01 +0000
Resent-Message-ID: <handler.68315.B68315.170475421331686 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68315
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68315 <at> debbugs.gnu.org
Received: via spool by 68315-submit <at> debbugs.gnu.org id=B68315.170475421331686
(code B ref 68315); Mon, 08 Jan 2024 22:51:01 +0000
Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 22:50:13 +0000
Received: from localhost ([127.0.0.1]:37829 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rMyRh-0008F0-8E
for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 17:50:13 -0500
Received: from 19.mo550.mail-out.ovh.net ([178.32.97.206]:52615)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1rMyRb-0008Eh-VG
for 68315 <at> debbugs.gnu.org; Mon, 08 Jan 2024 17:50:11 -0500
Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.2.10])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id B8A0F294BE
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 22:49:59 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-wfqdl (unknown [10.110.113.80])
by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8CE881FD7D
for <68315 <at> debbugs.gnu.org>; Mon, 8 Jan 2024 22:49:59 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.97])
by ghost-submission-6684bf9d7b-wfqdl with ESMTPSA
id yZROHhd8nGWyMgMAxmln/g (envelope-from <ngraves@HIDDEN>)
for <68315 <at> debbugs.gnu.org>; Mon, 08 Jan 2024 22:49:59 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-97G002a4285231-b4e9-457f-80d8-e0eaee400985,
93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
In-Reply-To: <20240108080350.1665-48-ngraves@HIDDEN>
References: <20240108080350.1665-1-ngraves@HIDDEN>
<20240108080350.1665-48-ngraves@HIDDEN>
Date: Mon, 08 Jan 2024 23:49:58 +0100
Message-ID: <871qarigo9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Ovh-Tracer-Id: 8941615586787713638
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehkedgtdegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffujghffffkgggtgfesthhqredttddtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeijeeukeekffevuedvhfefvdegheegiedtfefffeeltdefudduudelkeejheetudenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This last patch can be skipped if we want to avoid a lot of rebuilds,
and it doesn't matter for easier extensibility since the trivial
build-system is extensible.=20
On 2024-01-08 09:03, Nicolas Graves wrote:
> * guix/build-system/trivial.scm
> (trivial-build): Monadic procedure returns a gexp instead of a derivation.
> (trivial-cross-build): Monadic procedure returns a gexp instead of a deri=
vation.
>
> Change-Id: I261d5d5ae027a174eafa972e4f598afdc394caa3
> ---
> guix/build-system/trivial.scm | 41 ++++++++++++++---------------------
> 1 file changed, 16 insertions(+), 25 deletions(-)
>
> diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm
> index e08884baf1..bc71c94132 100644
> --- a/guix/build-system/trivial.scm
> +++ b/guix/build-system/trivial.scm
> @@ -1,5 +1,6 @@
> ;;; GNU Guix --- Functional package management for GNU
> ;;; Copyright =C2=A9 2012, 2013, 2014, 2015, 2018, 2021 Ludovic Court=C3=
=A8s <ludo@HIDDEN>
> +;;; Copyright =C2=A9 2024 Nicolas Graves <ngraves@HIDDEN>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -51,18 +52,13 @@ (define* (trivial-build name inputs
> search-paths allowed-references)
> "Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
> ignored."
> - (mlet %store-monad ((guile (package->derivation (or guile (default-gui=
le))
> - system #:graft? #f))
> - (builder -> (if (pair? builder)
> - (sexp->gexp builder)
> - builder)))
> - (gexp->derivation name (with-build-variables inputs outputs builder)
> - #:system system
> - #:target #f
> - #:graft? #f
> - #:modules modules
> - #:allowed-references allowed-references
> - #:guile-for-build guile)))
> + (mlet* %store-monad ((builder -> (if (pair? builder)
> + (sexp->gexp builder)
> + builder)))
> + (return (with-imported-modules modules
> + #~(begin
> + (use-modules #$@(sexp->gexp modules))
> + #$(with-build-variables inputs outputs builder))))))
>=20=20
> (define* (trivial-cross-build name
> #:key
> @@ -73,21 +69,16 @@ (define* (trivial-cross-build name
> allowed-references)
> "Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
> ignored."
> - (mlet %store-monad ((guile (package->derivation (or guile (default-gu=
ile))
> - system #:graft? #f))
> - (builder -> (if (pair? builder)
> + (mlet* %store-monad ((builder -> (if (pair? builder)
> (sexp->gexp builder)
> builder)))
> - (gexp->derivation name (with-build-variables
> - (append build-inputs target-inputs host-i=
nputs)
> - outputs
> - builder)
> - #:system system
> - #:target target
> - #:graft? #f
> - #:modules modules
> - #:allowed-references allowed-references
> - #:guile-for-build guile)))
> + (return (with-imported-modules modules
> + #~(begin
> + (use-modules #$@(sexp->gexp modules))
> + #$(with-build-variables
> + (append build-inputs target-inputs host-inputs)
> + outputs
> + builder))))))
>=20=20
> (define trivial-build-system
> (build-system
--=20
Best regards,
Nicolas Graves
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.