[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 32/48] build-system: perl: Redefine perl-build and pe
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 32/48] build-system: perl: Redefine perl-build and perl-cross-build. |
Date: |
Mon, 8 Jan 2024 09:03:04 +0100 |
* 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@gnu.org>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; 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
- [bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cross-build., (continued)
- [bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 22/48] build-system: guile: Redefine guile-build and guile-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 24/48] build-system: julia: Redefine julia-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 25/48] build-system: linux-module: Redefine linux-module-build functions., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 26/48] build-system: maven: Redefine maven-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 23/48] build-system: haskell: Redefine haskell-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 28/48] build-system: minify: Redefine minify-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 29/48] build-system: mix: Redefine mix-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 30/48] build-system: node: Redefine node-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 31/48] build-system: ocaml: Redefine ocaml-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 32/48] build-system: perl: Redefine perl-build and perl-cross-build.,
Nicolas Graves <=
- [bug#68315] [PATCH 33/48] build-system: pyproject: Redefine pyproject-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 27/48] build-system: meson: Redefine meson-build and meson-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 36/48] build-system: r: Redefine r-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 35/48] build-system: qt: Redefine qt-build and qt-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 38/48] build-system: rebar: Redefine rebar-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 34/48] build-system: python: Redefine python-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 39/48] build-system: renpy: Redefine renpy-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 41/48] build-system: ruby: Redefine ruby-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 40/48] build-system: ruby: Improve ruby-cross-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 46/48] build-system: waf: Improve waf-build style., Nicolas Graves, 2024/01/08