diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-12 18:00:16 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-12 22:47:08 +0200 |
| commit | 66a35ceb43f53c3f3e363714c9a6a402f243670d (patch) | |
| tree | 965ba0e0c297f124aad06d66af92102f3270c7cc /tests/gexp.scm | |
| parent | 9c14a487bb3813ec5a555536b6bd1c4160ebb042 (diff) | |
| download | gnu-guix-66a35ceb43f53c3f3e363714c9a6a402f243670d.tar gnu-guix-66a35ceb43f53c3f3e363714c9a6a402f243670d.tar.gz | |
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.
Diffstat (limited to 'tests/gexp.scm')
| -rw-r--r-- | tests/gexp.scm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index 36ce66f7cc..03a64fa6bb 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" |