[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/16: gexp: Remove more uses of #:modules.
From: |
Ludovic Courtès |
Subject: |
13/16: gexp: Remove more uses of #:modules. |
Date: |
Tue, 12 Jul 2016 20:48:20 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 66a35ceb43f53c3f3e363714c9a6a402f243670d
Author: Ludovic Courtès <address@hidden>
Date: Tue Jul 12 18:00:16 2016 +0200
gexp: Remove more uses of #:modules.
* guix/scripts/system.scm (switch-to-system): Adjust comment.
* tests/gexp.scm ("gexp->derivation #:references-graphs"): Use
'with-imported-modules' instead of #:modules.
* tests/grafts.scm ("graft-derivation, preserve empty directories"):
Likewise.
---
guix/scripts/system.scm | 2 +-
tests/gexp.scm | 36 ++++++++++++++++++------------------
tests/grafts.scm | 16 ++++++++--------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index dd1e534..e2c6b2e 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -362,7 +362,7 @@ it atomically, and then run OS's activation script."
;; The activation script may modify '%load-path' & co., so protect
;; against that. This is necessary to ensure that
;; 'upgrade-shepherd-services' gets to see the right modules when it
- ;; computes derivations with (gexp->derivation #:modules …).
+ ;; computes derivations with 'gexp->derivation'.
(save-load-path-excursion
(primitive-load (derivation->output-path script))))
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 36ce66f..03a64fa 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -601,26 +601,26 @@
((one (text-file "one" (random-text)))
(two (gexp->derivation "two"
#~(symlink #$one #$output:chbouib)))
- (drv (gexp->derivation "ref-graphs"
- #~(begin
- (use-modules (guix build store-copy))
- (with-output-to-file #$output
- (lambda ()
- (write (call-with-input-file "guile"
- read-reference-graph))))
- (with-output-to-file #$output:one
- (lambda ()
- (write (call-with-input-file "one"
- read-reference-graph))))
- (with-output-to-file #$output:two
- (lambda ()
- (write (call-with-input-file "two"
- read-reference-graph)))))
+ (build -> (with-imported-modules '((guix build store-copy)
+ (guix build utils))
+ #~(begin
+ (use-modules (guix build store-copy))
+ (with-output-to-file #$output
+ (lambda ()
+ (write (call-with-input-file "guile"
+ read-reference-graph))))
+ (with-output-to-file #$output:one
+ (lambda ()
+ (write (call-with-input-file "one"
+ read-reference-graph))))
+ (with-output-to-file #$output:two
+ (lambda ()
+ (write (call-with-input-file "two"
+ read-reference-graph)))))))
+ (drv (gexp->derivation "ref-graphs" build
#:references-graphs `(("one" ,one)
("two" ,two "chbouib")
- ("guile"
,%bootstrap-guile))
- #:modules '((guix build store-copy)
- (guix build utils))))
+ ("guile"
,%bootstrap-guile))))
(ok? (built-derivations (list drv)))
(guile-drv (package->derivation %bootstrap-guile))
(bash (interned-file (search-bootstrap-binary "bash"
diff --git a/tests/grafts.scm b/tests/grafts.scm
index 8cd0485..13c5675 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -135,14 +135,14 @@
(replacement fake)))
(drv (gexp->derivation
"to-graft"
- #~(begin
- (use-modules (guix build utils))
- (mkdir-p (string-append #$output
- "/a/b/c/d"))
- (symlink #$%bash
- (string-append #$output
- "/bash")))
- #:modules '((guix build utils))))
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (mkdir-p (string-append #$output
+ "/a/b/c/d"))
+ (symlink #$%bash
+ (string-append #$output
+ "/bash"))))))
(grafted ((store-lift graft-derivation) drv
(list graft)))
(_ (built-derivations (list grafted)))
- branch master updated (0885881 -> bdff55e), Ludovic Courtès, 2016/07/12
- 04/16: linux-container: Fix list of imported modules., Ludovic Courtès, 2016/07/12
- 05/16: gexp: Factorize load-path-setting expression., Ludovic Courtès, 2016/07/12
- 01/16: gexp: Keep only a single 'references' field., Ludovic Courtès, 2016/07/12
- 06/16: gexp: 'gexp->file' emits code to set '%load-path'., Ludovic Courtès, 2016/07/12
- 13/16: gexp: Remove more uses of #:modules.,
Ludovic Courtès <=
- 12/16: gexp: 'program-file' and 'gexp->script' no longer have #:modules., Ludovic Courtès, 2016/07/12
- 14/16: gnu: Remove unneeded 'imported-modules' fields for 'origin'., Ludovic Courtès, 2016/07/12
- 11/16: gexp: 'computed-file' no longer has a #:modules parameter., Ludovic Courtès, 2016/07/12
- 10/16: download: Use 'with-imported-modules'., Ludovic Courtès, 2016/07/12
- 16/16: gnu: emacs-flycheck: Add missing dependency on emacs-seq., Ludovic Courtès, 2016/07/12
- 02/16: gexp: Add 'with-imported-modules' macro., Ludovic Courtès, 2016/07/12
- 15/16: packages: <origin> no longer has an 'imported-modules' field., Ludovic Courtès, 2016/07/12
- 08/16: services: <shepherd-service> no longer has an 'imported-modules' field., Ludovic Courtès, 2016/07/12
- 09/16: profiles: Use 'with-imported-modules'., Ludovic Courtès, 2016/07/12
- 07/16: gnu: Use 'gexp->file' in conjunction with 'with-imported-modules'., Ludovic Courtès, 2016/07/12