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>.
This commit is contained in:
Ludovic Courtès 2017-12-13 15:13:07 +01:00
parent c2c5b115ab
commit 22358bdb7c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5

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