~ruther/guix-local: Revert "derivations: 'derivation-hash' assumes inputs are coalesced."

22358bdb7c75e571fd7922ef04e82be0a14cc698 — Ludovic Courtès 8 years ago c2c5b11

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

This reverts commit 1d008d9f8c44dfdb808235d451b72f255e72f103.
Reported by Rutger Helling <rhelling@mykolab.com>.
Fixes <https://bugs.gnu.org/29689>.

patch browse .tar.gz

1 files changed, 2 insertions(+), 5 deletions(-)

M guix/derivations.scm

M guix/derivations.scm => guix/derivations.scm +2 -5

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