ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix `derivation-hash' for outputs not sorted alphabetically.

Browse source 
* guix/derivations.scm (derivation-hash): Reorder OUTPUTS.
* tests/derivations.scm ("multiple-output derivation, non-alphabetic
  order"): New test.
This commit is contained in:
Ludovic Courtès 2012-07-01 15:37:58 +02:00
parent 062c6927ad
commit 4b1786aa2c
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
guix/derivations.scm
View file

@ -293,6 +293,9 @@ (define derivation-hash ; `hashDerivationModulo' in derivations.cc
(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

18
tests/derivations.scm
View file

@ -145,6 +145,24 @@ (define prefix-len (string-length dir))
(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")))