Fix `derivation-hash' for outputs not sorted alphabetically.
* guix/derivations.scm (derivation-hash): Reorder OUTPUTS. * tests/derivations.scm ("multiple-output derivation, non-alphabetic order"): New test.master
parent
062c6927ad
commit
4b1786aa2c
|
@ -293,6 +293,9 @@ in SIZE bytes."
|
||||||
(string<? (derivation-input-path i1)
|
(string<? (derivation-input-path i1)
|
||||||
(derivation-input-path i2)))))
|
(derivation-input-path i2)))))
|
||||||
(sources (sort sources string<?))
|
(sources (sort sources string<?))
|
||||||
|
(outputs (sort outputs
|
||||||
|
(lambda (o1 o2)
|
||||||
|
(string<? (car o1) (car o2)))))
|
||||||
(drv (make-derivation outputs inputs sources
|
(drv (make-derivation outputs inputs sources
|
||||||
system builder args env-vars)))
|
system builder args env-vars)))
|
||||||
(sha256
|
(sha256
|
||||||
|
|
|
@ -145,6 +145,24 @@
|
||||||
(and (eq? 'one (call-with-input-file one read))
|
(and (eq? 'one (call-with-input-file one read))
|
||||||
(eq? 'two (call-with-input-file two read)))))))
|
(eq? 'two (call-with-input-file two read)))))))
|
||||||
|
|
||||||
|
(test-assert "multiple-output derivation, non-alphabetic order"
|
||||||
|
;; Here, the outputs are not listed in alphabetic order. Yet, the store
|
||||||
|
;; path computation must reorder them first.
|
||||||
|
(let* ((builder (add-text-to-store %store "my-fixed-builder.sh"
|
||||||
|
"echo one > $out ; echo two > $AAA"
|
||||||
|
'()))
|
||||||
|
(drv-path (derivation %store "fixed" (%current-system)
|
||||||
|
"/bin/sh" `(,builder)
|
||||||
|
'()
|
||||||
|
`((,builder))
|
||||||
|
#:outputs '("out" "AAA")))
|
||||||
|
(succeeded? (build-derivations %store (list drv-path))))
|
||||||
|
(and succeeded?
|
||||||
|
(let ((one (derivation-path->output-path drv-path "out"))
|
||||||
|
(two (derivation-path->output-path drv-path "AAA")))
|
||||||
|
(and (eq? 'one (call-with-input-file one read))
|
||||||
|
(eq? 'two (call-with-input-file two read)))))))
|
||||||
|
|
||||||
|
|
||||||
(define %coreutils
|
(define %coreutils
|
||||||
(false-if-exception (nixpkgs-derivation "coreutils")))
|
(false-if-exception (nixpkgs-derivation "coreutils")))
|
||||||
|
|
Reference in New Issue