gexp: 'imported-files' no longer creates a derivation by default.
authorLudovic Courtès <ludo@gnu.org>
Mon, 16 Jul 2018 09:17:55 +0000 (11:17 +0200)
committerLudovic Courtès <ludo@gnu.org>
Thu, 19 Jul 2018 09:48:04 +0000 (11:48 +0200)
commit8df2eca6b0915942ea087d7c5981514c532d47a2
tree5a22ca226284b1d9a35c826a74ff029e5207bdc6
parent4d20d87b53930c68bab1b6d8865402260c351145
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.
guix/gexp.scm
guix/packages.scm
tests/gexp.scm