[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 25/48] build-system: linux-module: Redefine linux-mod
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 25/48] build-system: linux-module: Redefine linux-module-build functions. |
Date: |
Mon, 8 Jan 2024 09:02:57 +0100 |
* 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@gmail.com>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; 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
- [bug#68315] [PATCH 10/48] build-system: clojure: Redefine clojure-build., (continued)
- [bug#68315] [PATCH 10/48] build-system: clojure: Redefine clojure-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 13/48] build-system: copy: Redefine copy-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 14/48] build-system: dub: Redefine dub-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 19/48] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 17/48] build-system: emacs: Redefine emacs-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 18/48] build-system: font: Redefine font-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 20/48] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions., Nicolas Graves, 2024/01/08
- [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 <=
- [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, 2024/01/08
- [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