aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-12 18:09:53 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-12 18:11:22 +0100
commit1d008d9f8c44dfdb808235d451b72f255e72f103 (patch)
treeb0fab4c78a9a09282d53d08289bf16b9d771fdd4
parent3d19b7fbc2f9394ad7d957f1408fef9fc0589ce6 (diff)
downloadguix-1d008d9f8c44dfdb808235d451b72f255e72f103.tar
guix-1d008d9f8c44dfdb808235d451b72f255e72f103.tar.gz
derivations: 'derivation-hash' assumes inputs are coalesced.
* guix/derivations.scm (derivation-hash): Remove redundant 'coalesce-duplicate-inputs' call.
-rw-r--r--guix/derivations.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm
index b95849727b..f842d26be8 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -658,8 +658,11 @@ derivation at FILE."
(make-derivation-input hash sub-drvs))))
inputs))
(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
system builder args env-vars
#f)))