aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/derivations.scm3
-rw-r--r--tests/derivations.scm18
2 files changed, 21 insertions, 0 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm
index a2bff44a5f..f85666bcb9 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -293,6 +293,9 @@ in SIZE bytes."
(string<? (derivation-input-path i1)
(derivation-input-path i2)))))
(sources (sort sources string<?))
+ (outputs (sort outputs
+ (lambda (o1 o2)
+ (string<? (car o1) (car o2)))))
(drv (make-derivation outputs inputs sources
system builder args env-vars)))
(sha256
diff --git a/tests/derivations.scm b/tests/derivations.scm
index b6bd4dab0d..cdb1942539 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -145,6 +145,24 @@
(and (eq? 'one (call-with-input-file one 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
(false-if-exception (nixpkgs-derivation "coreutils")))