05/05: derivations: 'derivation-hash' assumes inputs are coalesced.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1d008d9f8c44dfdb808235d451b72f255e72f103
Author: Ludovic Courtès <address@hidden>
Date:   Tue Dec 12 18:09:53 2017 +0100

    derivations: 'derivation-hash' assumes inputs are coalesced.
    
    * guix/derivations.scm (derivation-hash): Remove
    redundant 'coalesce-duplicate-inputs' call.
---
 guix/derivations.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/derivations.scm b/guix/derivations.scm
index b958497..f842d26 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -658,8 +658,11 @@ derivation at FILE."
                                 (make-derivation-input hash sub-drvs))))
                            inputs))
               (drv    (make-derivation outputs
-                                       (sort (coalesce-duplicate-inputs inputs)
-                                             derivation-input<?)
+
+                                       ;; Note: INPUTS is already the result
+                                       ;; of 'coalesce-duplicate-inputs'.
+                                       (sort inputs derivation-input<?)
+
                                        sources
                                        system builder args env-vars
                                        #f)))