aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-13 15:13:07 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-13 15:13:38 +0100
commit22358bdb7c75e571fd7922ef04e82be0a14cc698 (patch)
treef454e9cf540a24d69ecccd1ff0db6c549e9a0ce9
parentc2c5b115ab0d855ed96065043fd22574fb69093a (diff)
downloadguix-22358bdb7c75e571fd7922ef04e82be0a14cc698.tar
guix-22358bdb7c75e571fd7922ef04e82be0a14cc698.tar.gz
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>.
-rw-r--r--guix/derivations.scm7
1 files changed, 2 insertions, 5 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm
index f842d26be8..b95849727b 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -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)))