diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-05-25 16:06:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-05-25 23:00:30 +0200 |
| commit | abf43d4511566e97f09049aa8b29453a2ed5ed16 (patch) | |
| tree | 8d53e34d2f04d3ec6da2a11e8a97bcbc922e12fa /guix | |
| parent | e033700f17660ff936936cf89cc557b95d12bb13 (diff) | |
| download | patches-abf43d4511566e97f09049aa8b29453a2ed5ed16.tar patches-abf43d4511566e97f09049aa8b29453a2ed5ed16.tar.gz | |
gexp: Fix expansion for (file-append (local-file ...) ...).
Fixes <https://bugs.gnu.org/41527>.
Regression introduced in d03001a31a6d460b712825640dba11e3f1a53a14.
* guix/gexp.scm (lower+expand-object): When LOWERED is not a struct and
EXPAND is true, call EXPAND.
* tests/gexp.scm ("file-append, raw store item"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/gexp.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index 78b8af6fbc..9e193c76c4 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -270,7 +270,9 @@ expand to file names, but it's possible to expand to a plain data type." (if (not expand) (loop lowered (lookup-expander lowered)) (return (expand obj lowered output))) - (return lowered))))))) ;self-quoting + (if (not expand) ;self-quoting + (return lowered) + (return (expand obj lowered output))))))))) (define-syntax define-gexp-compiler (syntax-rules (=> compiler expander) |