From 4b1786aa2c2e21e5b0c439cf6ad91f157376af5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 1 Jul 2012 15:37:58 +0200
Subject: [PATCH] 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.
---
 guix/derivations.scm  |  3 +++
 tests/derivations.scm | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

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")))