01/01: Revert "derivations: 'derivation-hash' assumes inputs are coalesced."

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 22358bdb7c75e571fd7922ef04e82be0a14cc698
Author: Ludovic Courtès <address@hidden>
Date:   Wed Dec 13 15:13:07 2017 +0100

    Revert "derivations: 'derivation-hash' assumes inputs are coalesced."
    
    This reverts commit 1d008d9f8c44dfdb808235d451b72f255e72f103.
    Reported by Rutger Helling <address@hidden>.
    Fixes <https://bugs.gnu.org/29689>.
---
 guix/derivations.scm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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