gexp: <lowered-gexp> separates sources from derivation inputs.
authorLudovic Courtès <ludo@gnu.org>
Tue, 9 Jul 2019 21:05:01 +0000 (23:05 +0200)
committerLudovic Courtès <ludo@gnu.org>
Mon, 15 Jul 2019 08:01:05 +0000 (10:01 +0200)
commit386857748097619b3b75a7bf93677b6aa742d03c
tree1284c8d01514268d62a60cf9dc74464d7bdcb245
parent4daf89d619be788cf5a71867ad674cd5ff6e31fe
gexp: <lowered-gexp> separates sources from derivation inputs.

* guix/gexp.scm (lower-inputs): Return either <derivation-input> records
or store items.
(lower-reference-graphs): Return file/input pairs.
(<lowered-gexp>)[sources]: New field.
(lower-gexp): Adjust accordingly.
(gexp->input-tuple): Remove.
(gexp->derivation)[graphs-file-names]: Handle only the
'derivation-input?' and 'string?' cases.
Pass #:sources to 'raw-derivation'; ensure #:inputs contains only
<derivation-input> records.
* guix/remote.scm (remote-eval): Adjust to the new <lowered-gexp>
interface.
* tests/gexp.scm ("lower-gexp"): Adjust to expect <derivation-input>
records instead of <gexp-input>
guix/gexp.scm
guix/remote.scm
tests/gexp.scm