diff options
author | Ludovic Courtès <ludo@gnu.org> | 2018-07-16 11:17:55 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2018-07-19 11:48:04 +0200 |
commit | 8df2eca6b0915942ea087d7c5981514c532d47a2 (patch) | |
tree | 5a22ca226284b1d9a35c826a74ff029e5207bdc6 /gnu.scm | |
parent | 4d20d87b53930c68bab1b6d8865402260c351145 (diff) | |
download | guix-8df2eca6b0915942ea087d7c5981514c532d47a2.tar guix-8df2eca6b0915942ea087d7c5981514c532d47a2.tar.gz |
gexp: 'imported-files' no longer creates a derivation by default.
* guix/gexp.scm (gexp->derivation): Add #:import-creates-derivation?.
Pass #:derivation? to 'imported-modules' and 'compiled-modules'. In -L
argument, check whether MODULES is a derivation.
(%not-slash): New variable.
(file-mapping->tree): New procedure.
(imported-files): Rename to...
(imported-files/derivation): ... this.
(imported-files): New procedure. Rewrite in terms of
'interned-file-tree' when possible; add #:derivation? parameter.
(imported-modules, compiled-modules): Add #:derivation? parameter and
pass it to 'imported-files'.
* guix/packages.scm (patch-and-repack): Pass
#:import-creates-derivation? to 'gexp->derivation'.
* tests/gexp.scm ("imported-files"): Adjust to no longer expect a
derivation.
Diffstat (limited to 'gnu.scm')
0 files changed, 0 insertions, 0 deletions