diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-09 23:05:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-15 10:01:05 +0200 |
| commit | 386857748097619b3b75a7bf93677b6aa742d03c (patch) | |
| tree | 1284c8d01514268d62a60cf9dc74464d7bdcb245 /tests | |
| parent | 4daf89d619be788cf5a71867ad674cd5ff6e31fe (diff) | |
| download | guix-386857748097619b3b75a7bf93677b6aa742d03c.tar.gz | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gexp.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index 23904fce2e..a1f79e3435 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -849,8 +849,9 @@ #:effective-version "2.0"))) (define (matching-input drv output) (lambda (input) - (and (eq? (gexp-input-thing input) drv) - (string=? (gexp-input-output input) output)))) + (and (eq? (derivation-input-derivation input) drv) + (equal? (derivation-input-sub-derivations input) + (list output))))) (mbegin %store-monad (return (and (find (matching-input extension-drv "out") |