diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-09 00:07:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-09 00:07:10 +0100 |
| commit | 7bdd1f0e3c99c64315c1a502b136fac0b78e716d (patch) | |
| tree | 497a2489f0ee157aa34318424af6058256b377b5 /guix | |
| parent | 813986ac09b7fef9cf5ed8f2c9e4e37b2dea3eef (diff) | |
| download | guix-7bdd1f0e3c99c64315c1a502b136fac0b78e716d.tar guix-7bdd1f0e3c99c64315c1a502b136fac0b78e716d.tar.gz | |
derivations: build-expression->derivation: Builder only refers to sources.
* guix/derivations.scm (build-expression->derivation)[source-path]: New
procedure.
[builder]: Pass only sources as references. This fixes a bug whereby
changing a fixed-output drv referred to by a builder would cause the
builder's hash to change, thereby leading to a full rebuild.
* tests/derivations.scm ("build-expression->derivation with a
fixed-output input"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/derivations.scm | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index 7fc8734238..cbf755ab63 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -595,6 +595,14 @@ omitted or is #f, the value of the `%guile-for-build' fluid is used instead." (((or 'define-module 'use-modules) _ ...) #t) (_ #f))) + (define source-path + ;; When passed an input that is a source, return its path; otherwise + ;; return #f. + (match-lambda + ((_ path _ ...) + (and (not (derivation-path? path)) + path)))) + (let* ((prologue `(begin ,@(match exp ((_ ...) @@ -639,7 +647,18 @@ omitted or is #f, the value of the `%guile-for-build' fluid is used instead." ((_ ...) (remove module-form? exp)) (_ `(,exp)))))) - (map second inputs))) + + ;; The references don't really matter + ;; since the builder is always used in + ;; conjunction with the drv that needs + ;; it. For clarity, we add references + ;; to the subset of INPUTS that are + ;; sources, avoiding references to other + ;; .drv; otherwise, BUILDER's hash would + ;; depend on those, even if they are + ;; fixed-output. + (filter-map source-path inputs))) + (mod-drv (and (pair? modules) (imported-modules store modules #:guile guile-drv |