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 /tests | |
| parent | 813986ac09b7fef9cf5ed8f2c9e4e37b2dea3eef (diff) | |
| download | patches-7bdd1f0e3c99c64315c1a502b136fac0b78e716d.tar patches-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 'tests')
| -rw-r--r-- | tests/derivations.scm | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index 7fde2ef2a2..01ede11af0 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -459,6 +459,40 @@ (string=? (derivation-path->output-path input1) (derivation-path->output-path input2))))) +(test-assert "build-expression->derivation with a fixed-output input" + (let* ((builder1 '(call-with-output-file %output + (lambda (p) + (write "hello" p)))) + (builder2 '(call-with-output-file (pk 'difference-here! %output) + (lambda (p) + (write "hello" p)))) + (hash (sha256 (string->utf8 "hello"))) + (input1 (build-expression->derivation %store "fixed" + (%current-system) + builder1 '() + #:hash hash + #:hash-algo 'sha256)) + (input2 (build-expression->derivation %store "fixed" + (%current-system) + builder2 '() + #:hash hash + #:hash-algo 'sha256)) + (builder3 '(let ((input (assoc-ref %build-inputs "input"))) + (call-with-output-file %output + (lambda (out) + (format #f "My input is ~a.~%" input))))) + (final1 (build-expression->derivation %store "final" + (%current-system) + builder3 + `(("input" ,input1)))) + (final2 (build-expression->derivation %store "final" + (%current-system) + builder3 + `(("input" ,input2))))) + (and (string=? (derivation-path->output-path final1) + (derivation-path->output-path final2)) + (build-derivations %store (list final1 final2))))) + (test-end) |