diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
| commit | fe6d003908fd8278de65761bc550240c520ef9f4 (patch) | |
| tree | abe88c7905a8907ddafc554fbeef5b0af08f835d /guix/gexp.scm | |
| parent | 8a7a5dc7805f4628e60f90af6b2416f951d0c034 (diff) | |
| parent | 031315e4f0fbc4e04ffc8adee04128c23173a1f7 (diff) | |
| download | guix-patches-fe6d003908fd8278de65761bc550240c520ef9f4.tar guix-patches-fe6d003908fd8278de65761bc550240c520ef9f4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/gexp.scm')
| -rw-r--r-- | guix/gexp.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index 78b8af6fbc..67b6121313 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -51,6 +51,7 @@ local-file-absolute-file-name local-file-name local-file-recursive? + local-file-select? plain-file plain-file? @@ -270,7 +271,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) @@ -1440,6 +1443,7 @@ to the source files instead of copying them." #:system system #:guile-for-build guile #:local-build? #t + #:substitutable? #f ;; Avoid deprecation warnings about the use of the _IO* ;; constants in (guix build utils). |