nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>.
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
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/derivations.scm
View File

@ -658,11 +658,8 @@ derivation at FILE."
(make-derivation-input hash sub-drvs)))) (make-derivation-input hash sub-drvs))))
inputs)) inputs))
(drv (make-derivation outputs (drv (make-derivation outputs
(sort (coalesce-duplicate-inputs inputs)
;; Note: INPUTS is already the result derivation-input<?)
;; of 'coalesce-duplicate-inputs'.
(sort inputs derivation-input<?)
sources sources
system builder args env-vars system builder args env-vars
#f))) #f)))