[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitte
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitter-build functions. |
Date: |
Mon, 8 Jan 2024 09:03:16 +0100 |
* 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@gmx.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; 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
- [bug#68315] [PATCH 35/48] build-system: qt: Redefine qt-build and qt-cross-build., (continued)
- [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
- [bug#68315] [PATCH 43/48] build-system: texlive: Redefine texlive-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 37/48] build-system: rakudo: Redefine rakudo-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitter-build functions.,
Nicolas Graves <=
- [bug#68315] [PATCH 42/48] build-system: scons: Redefine scons-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 47/48] build-system: zig: Redefine zig-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions., Nicolas Graves, 2024/01/08