diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
| commit | 893c2df00daa4e6dd6a7ff3813d7df5329877f9e (patch) | |
| tree | acd0db459464acae47083b66d5ce12cc656e2f10 /guix/derivations.scm | |
| parent | 04b9b7bb05aff4c41f46cd79aa7bc953ace16e86 (diff) | |
| parent | 0ccc9a0f5bb89b239d56157ea66f8420fcec5ba6 (diff) | |
| download | gnu-guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar gnu-guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/derivations.scm')
| -rw-r--r-- | guix/derivations.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index 92d50503ce..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'." @@ -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<? (derivation-input-derivation drv1) (derivation-input-derivation drv2)))) |