diff options
| author | Marius Bakke <[email protected]> | 2018-06-18 15:29:38 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2018-06-18 15:29:38 +0200 |
| commit | 6969c4de445a390eaa05de22bc5a537a76a76169 (patch) | |
| tree | 9df3bdde497fdce705ae4eb66972f93a9ae111d9 /tests/gexp.scm | |
| parent | 73d18915b597f2a386d6ae42930b49a13c8813b0 (diff) | |
| parent | 32eb44240db23b2320a68a3ab17370531945587f (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'tests/gexp.scm')
| -rw-r--r-- | tests/gexp.scm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index a560adfc5c..83fe811546 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -615,6 +615,7 @@ `(("graph" ,two)) #:modules '((guix build store-copy) + (guix sets) (guix build utils)))) (ok? (built-derivations (list drv))) (out -> (derivation->output-path drv))) @@ -815,21 +816,25 @@ (two (gexp->derivation "two" #~(symlink #$one #$output:chbouib))) (build -> (with-imported-modules '((guix build store-copy) + (guix sets) (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)))) + (write (map store-info-item + (call-with-input-file "guile" + read-reference-graph))))) (with-output-to-file #$output:one (lambda () - (write (call-with-input-file "one" - read-reference-graph)))) + (write (map store-info-item + (call-with-input-file "one" + read-reference-graph))))) (with-output-to-file #$output:two (lambda () - (write (call-with-input-file "two" - read-reference-graph))))))) + (write (map store-info-item + (call-with-input-file "two" + read-reference-graph)))))))) (drv (gexp->derivation "ref-graphs" build #:references-graphs `(("one" ,one) ("two" ,two "chbouib") |