[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: gexp: 'gexp->file' emits code to set '%load-path'.
From: |
Ludovic Courtès |
Subject: |
06/07: gexp: 'gexp->file' emits code to set '%load-path'. |
Date: |
Mon, 4 Jul 2016 22:17:31 +0000 (UTC) |
civodul pushed a commit to branch wip-gexp-imported-modules
in repository guix.
commit 91b37d02e219d4c52a0f7d50ae8ebb6466c9dc0f
Author: Ludovic Courtès <address@hidden>
Date: Mon Jul 4 23:54:18 2016 +0200
gexp: 'gexp->file' emits code to set '%load-path'.
* guix/gexp.scm (gexp->file): Add #:set-load-path? parameter and honor it.
* gnu/system.scm (operating-system-parameters-file): Pass
#:set-load-path? #f.
* doc/guix.texi (G-Expressions): Adjust accordingly.
---
doc/guix.texi | 6 +++++-
gnu/system.scm | 3 ++-
guix/gexp.scm | 32 +++++++++++++++++++++++---------
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index f3dbf69..d771c39 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3941,8 +3941,12 @@ script, and @var{modules} is the list of modules visible
to that script.
This is the declarative counterpart of @code{gexp->script}.
@end deffn
address@hidden {Monadic Procedure} gexp->file @var{name} @var{exp}
address@hidden {Monadic Procedure} gexp->file @var{name} @var{exp} @
+ [#:set-load-path? #t]
Return a derivation that builds a file @var{name} containing @var{exp}.
+When @var{set-load-path?} is true, emit code in the resulting file to
+set @code{%load-path} and @code{%load-compiled-path} to honor
address@hidden's imported modules.
The resulting file holds references to all the dependencies of @var{exp}
or a subset thereof.
diff --git a/gnu/system.scm b/gnu/system.scm
index 96ea153..a49b3f2 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -731,7 +731,8 @@ this file is the reconstruction of GRUB menu entries for
old configurations."
(kernel #$(operating-system-kernel os))
(kernel-arguments
#$(operating-system-kernel-arguments os))
- (initrd #$initrd)))))
+ (initrd #$initrd))
+ #:set-load-path? #f)))
;;;
diff --git a/guix/gexp.scm b/guix/gexp.scm
index de0a98a..bbb75a5 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1025,15 +1025,29 @@ its search path."
(write '(ungexp exp) port)
(chmod port #o555)))))))
-(define (gexp->file name exp)
- "Return a derivation that builds a file NAME containing EXP."
- (gexp->derivation name
- (gexp
- (call-with-output-file (ungexp output)
- (lambda (port)
- (write '(ungexp exp) port))))
- #:local-build? #t
- #:substitutable? #f))
+(define* (gexp->file name exp #:key (set-load-path? #t))
+ "Return a derivation that builds a file NAME containing EXP. When
+SET-LOAD-PATH? is true, emit code in the resulting file to set '%load-path'
+and '%load-compiled-path' to honor EXP's imported modules."
+ (match (if set-load-path? (gexp-modules exp) '())
+ (() ;zero modules
+ (gexp->derivation name
+ (gexp
+ (call-with-output-file (ungexp output)
+ (lambda (port)
+ (write '(ungexp exp) port))))
+ #:local-build? #t
+ #:substitutable? #f))
+ ((modules ...)
+ (mlet %store-monad ((set-load-path (load-path-expression modules)))
+ (gexp->derivation name
+ (gexp
+ (call-with-output-file (ungexp output)
+ (lambda (port)
+ (write '(ungexp set-load-path) port)
+ (write '(ungexp exp) port))))
+ #:local-build? #t
+ #:substitutable? #f)))))
(define* (text-file* name #:rest text)
"Return as a monadic value a derivation that builds a text file containing
- branch wip-gexp-imported-modules created (now 5cb9908), Ludovic Courtès, 2016/07/04
- 04/07: linux-container: Fix list of imported modules., Ludovic Courtès, 2016/07/04
- 01/07: gexp: Keep only a single 'references' field., Ludovic Courtès, 2016/07/04
- 06/07: gexp: 'gexp->file' emits code to set '%load-path'.,
Ludovic Courtès <=
- 05/07: gexp: Factorize load-path-setting expression., Ludovic Courtès, 2016/07/04
- 02/07: gexp: Add 'with-imported-modules' macro., Ludovic Courtès, 2016/07/04
- 07/07: gnu: Use 'gexp->file' in conjunction with 'with-imported-modules'., Ludovic Courtès, 2016/07/04
- 03/07: gnu: Switch to 'with-imported-modules'., Ludovic Courtès, 2016/07/04