diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-10 18:39:25 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-15 10:01:05 +0200 |
| commit | b9373e262730578ba6c3805ffe44900f10bc655c (patch) | |
| tree | c232d2f55b3afe50f415e386dd13ea44a65b4348 /tests | |
| parent | 93c2a0073945e8c3967cdb0e250d3341f7dcac71 (diff) | |
| download | patches-b9373e262730578ba6c3805ffe44900f10bc655c.tar patches-b9373e262730578ba6c3805ffe44900f10bc655c.tar.gz | |
gexp: 'lowered-gexp-guile' now returns a <derivation-input>.
* guix/derivations.scm (derivation-input-output-path): New procedure.
* guix/gexp.scm (lower-gexp): Wrap GUILE in a <derivation-input>.
(gexp->derivation): Adjust accordingly.
* guix/remote.scm (remote-pipe-for-gexp, remote-eval): Adjust
accordingly.
* tests/gexp.scm ("lower-gexp"): Adjust accordingly.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gexp.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index a1f79e3435..460afe7f59 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -868,7 +868,8 @@ "/lib/guile/2.0/site-ccache") (lowered-gexp-load-compiled-path lexp)) (= 2 (length (lowered-gexp-load-compiled-path lexp))) - (eq? (lowered-gexp-guile lexp) (%guile-for-build))))))) + (eq? (derivation-input-derivation (lowered-gexp-guile lexp)) + (%guile-for-build))))))) (test-assertm "gexp->derivation #:references-graphs" (mlet* %store-monad |