From 268896444bed7b958add74b2e1e86ff802c5f5cb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Aug 2019 18:41:55 +0200 Subject: derivations: Delete duplicate inputs when computing derivation hash. Fixes . Reported by Carl Dong . * guix/derivations.scm (derivation/masked-inputs): Call 'delete-duplicates' on INPUTS. * tests/derivations.scm ("derivation with duplicate fixed-output inputs"): New test. --- guix/derivations.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/derivations.scm') diff --git a/guix/derivations.scm b/guix/derivations.scm index 92d50503ce..b3928920e2 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -685,7 +685,7 @@ name of each input with that input's hash." (make-derivation-input hash sub-drvs)))) inputs))) (make-derivation outputs - (sort inputs + (sort (delete-duplicates inputs) (lambda (drv1 drv2) (string Date: Sat, 17 Aug 2019 19:14:49 +0200 Subject: derivations: Fix typo in docstring. * guix/derivations.scm (derivation-build-plan): Fix typo in the docstring. --- guix/derivations.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix/derivations.scm') diff --git a/guix/derivations.scm b/guix/derivations.scm index b3928920e2..e1073ea39b 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -376,8 +376,8 @@ of SUBSTITUTABLES." (substitution-oracle store inputs #:mode mode))) "Given INPUTS, a list of derivation-inputs, return two values: the list of -derivation to build, and the list of substitutable items that, together, -allows INPUTS to be realized. +derivations to build, and the list of substitutable items that, together, +allow INPUTS to be realized. SUBSTITUTABLE-INFO must be a one-argument procedure similar to that returned by 'substitution-oracle'." -- cgit v1.2.3