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
8cef92d063, 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.
This commit is contained in:
Ludovic Courtès 2021-06-22 16:42:06 +02:00
parent c7a5c3e0bb
commit b9a95420ab
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 33 additions and 3 deletions

View File

@ -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))

View File

@ -279,6 +279,36 @@
(string=? (dirname (readlink bindir))
(derivation->output-path guile))))))
(test-assertm "profile-derivation, ordering & collisions"
;; ENTRY1 and ENTRY2 both provide 'bin/guile'--a collision. Make sure
;; ENTRY1 "wins" over ENTRY2. See <https://bugs.gnu.org/49102>.
(mlet* %store-monad
((entry1 -> (package->manifest-entry %bootstrap-guile))
(entry2 -> (manifest-entry
(name "fake-guile")
(version "0")
(item (computed-file
"fake-guile"
#~(begin
(mkdir #$output)
(mkdir (string-append #$output "/bin"))
(call-with-output-file
(string-append #$output "/bin/guile")
(lambda (port)
(display "Fake!\n" port))))))))
(guile (package->derivation %bootstrap-guile))
(drv (profile-derivation (manifest (list entry1 entry2))
#:hooks '()
#:locales? #f))
(profile -> (derivation->output-path drv))
(bindir -> (string-append profile "/bin"))
(file -> (string-append bindir "/guile"))
(_ (built-derivations (list drv))))
(return (string=? (readlink file)
(string-append
(derivation->output-path guile)
"/bin/guile")))))
(test-assertm "load-profile"
(mlet* %store-monad
((entry -> (package->manifest-entry %bootstrap-guile))