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

This reverts commit 1d008d9f8c. Reported by Rutger Helling <rhelling@mykolab.com>. Fixes <https://bugs.gnu.org/29689>.
2017-12-13 15:13:07 +01:00 · 2017-12-13 15:13:07 +01:00 · 22358bdb7c
parent c2c5b115ab
commit 22358bdb7c
1 changed files with 2 additions and 5 deletions
--- 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)))