[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
32/33: gexp: Add #:guile parameter to 'load-path-expression'.
From: |
guix-commits |
Subject: |
32/33: gexp: Add #:guile parameter to 'load-path-expression'. |
Date: |
Mon, 29 Mar 2021 10:48:26 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 58210fbea2dbc66ee0947eba7d5def2e593797a4
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Mar 24 22:40:31 2021 +0100
gexp: Add #:guile parameter to 'load-path-expression'.
* guix/gexp.scm (load-path-expression): Add #:guile parameter and honor it.
---
guix/gexp.scm | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index b01c78b..654ac0f 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1735,21 +1735,26 @@ TARGET, a GNU triplet."
'guile-3.0))
(define* (load-path-expression modules #:optional (path %load-path)
- #:key (extensions '()) system target)
+ #:key (extensions '()) system target
+ (guile (default-guile)))
"Return as a monadic value a gexp that sets '%load-path' and
'%load-compiled-path' to point to MODULES, a list of module names. MODULES
-are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty."
+are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty.
+Assume MODULES are compiled with GUILE."
(if (and (null? modules) (null? extensions))
(with-monad %store-monad
(return #f))
- (mlet %store-monad ((modules (imported-modules modules
- #:module-path path
- #:system system))
- (compiled (compiled-modules modules
- #:extensions extensions
- #:module-path path
- #:system system
- #:target target)))
+ (mlet* %store-monad ((guile (lower-object guile system #:target #f))
+ (compiled (compiled-modules modules
+ #:guile guile
+ #:extensions extensions
+ #:module-path path
+ #:system system
+ #:target target))
+ (modules (imported-modules modules
+ #:guile guile
+ #:module-path path
+ #:system system)))
(return
(gexp (eval-when (expand load eval)
;; Augment the load paths and delete duplicates. Do that
- 19/33: gnu: Add julia-commonsubexpressions., (continued)
- 19/33: gnu: Add julia-commonsubexpressions., guix-commits, 2021/03/29
- 28/33: gnu: Add julia-forwarddiff., guix-commits, 2021/03/29
- 10/33: gnu: Add julia-colortypes., guix-commits, 2021/03/29
- 16/33: gnu: Add julia-finitedifferences., guix-commits, 2021/03/29
- 15/33: gnu: Add julia-richardson., guix-commits, 2021/03/29
- 33/33: gexp: 'gexp->script' uses #:guile also as the guile-for-build., guix-commits, 2021/03/29
- 09/33: gnu: Add julia-abstractffts., guix-commits, 2021/03/29
- 25/33: gnu: Add julia-specialfunctions., guix-commits, 2021/03/29
- 22/33: gnu: Add julia-difftests., guix-commits, 2021/03/29
- 29/33: gnu: Add julia-zygoterules., guix-commits, 2021/03/29
- 32/33: gexp: Add #:guile parameter to 'load-path-expression'.,
guix-commits <=
- 24/33: gnu: Add julia-openspecfun-jll., guix-commits, 2021/03/29
- 23/33: gnu: Add julia-compilersupportlibraries-jll., guix-commits, 2021/03/29
- 18/33: gnu: Add julia-fillarrays., guix-commits, 2021/03/29
- 30/33: gnu: Add julia-zygote., guix-commits, 2021/03/29
- 27/33: gnu: Add julia-chainrules., guix-commits, 2021/03/29
- 17/33: gnu: Add julia-chainrulestestutils., guix-commits, 2021/03/29