From 1d008d9f8c44dfdb808235d451b72f255e72f103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 12 Dec 2017 18:09:53 +0100
Subject: [PATCH] derivations: 'derivation-hash' assumes inputs are coalesced.
* guix/derivations.scm (derivation-hash): Remove
redundant 'coalesce-duplicate-inputs' call.
---
guix/derivations.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guix/derivations.scm b/guix/derivations.scm
index b95849727b3..f842d26be80 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -658,8 +658,11 @@ (define derivation-hash ; `hashDerivationModulo' in derivations.cc
(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)))
--
GitLab