diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-06-22 16:42:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-06-22 17:55:05 +0200 |
| commit | b9a95420abdf4ae7fe9a347031278a44ad6a1cce (patch) | |
| tree | 6df8009947a967e7ca756625f4b85b952f874ae0 /guix | |
| parent | c7a5c3e0bba2ac3d197b219d21527863308b75dd (diff) | |
profiles: Build union of inputs in the right order.
Fixes <https://bugs.gnu.org/49102>.
Reported by Mathieu Othacehe <othacehe@gnu.org>
and Tobias Geerinckx-Rice <me@tobias.gr>.
Fixes a regression introduced in
8cef92d0633850d97c1a1d4521812268f56672be, whereby in case of file
collisions, the "wrong" one would take precedence.
* guix/build/profiles.scm (manifest-sexp->inputs+search-paths): Perform
a breadth-first traversal. Reverse INPUTS and SEARCH-PATHS in the base
case.
* tests/profiles.scm ("profile-derivation, ordering & collisions"):
New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/profiles.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm index 9249977bed..f9875ca92e 100644 --- a/guix/build/profiles.scm +++ b/guix/build/profiles.scm @@ -159,15 +159,15 @@ search path specifications." (((name version output item ('propagated-inputs deps) ('search-paths paths) _ ...) . rest) - (loop (append deps rest) + (loop (append rest deps) ;breadth-first traversal (cons item inputs) (append paths search-paths))) (() - (values inputs + (values (reverse inputs) (delete-duplicates (cons $PATH (map sexp->search-path-specification - search-paths)))))))))) + (reverse search-paths))))))))))) (define* (build-profile output manifest #:key (extra-inputs '()) (symlink symlink)) |