ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* guix/derivations.scm (derivation-hash): Remove
redundant 'coalesce-duplicate-inputs' call.
This commit is contained in:
Ludovic Courtès 2017-12-12 18:09:53 +01:00
parent 3d19b7fbc2
commit 1d008d9f8c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
guix/derivations.scm
View file

@ -658,8 +658,11 @@ (define derivation-hash ; `hashDerivationModulo' in derivations.cc
(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)
derivation-input<?) ;; Note: INPUTS is already the result
;; of 'coalesce-duplicate-inputs'.
(sort inputs derivation-input<?)
sources sources
system builder args env-vars system builder args env-vars
#f))) #f)))