cabal-install-solver: fix pkgconf 1.9 --modversion regression #9391
Conversation
cabal-install-solver/src/Distribution/Solver/Types/PkgConfigDb.hs
Outdated
Show resolved
Hide resolved
|
I'm confused. Isn't this the same thing fixed by #9134 which is already merged? |
|
I think this PR is fixing a bug in #9134. |
Please see my comment on the code there |
|
Could we consider just dropping the batch query completely? This was asked in #9134 (comment) and #9134 (comment). AFAICT all it gives us is a fairly small speedup on some systems, while doubling the time for anyone with any broken packages (which is common: #8930) and adding complexity. (It would be even better if we cached results on a per-package basis, as in #9360.) |
|
I would rather merge this PR as is, as a straightforward bug fix. The change to pkg-config querying logic could go in a separate PR. |
juhp
added
merge me
|
Does this require a changelog entry? |
|
yes please! :) |
juhp
force-pushed
the
pkgconf-1.9
branch
2 times, most recently
from
b43fb62
to
c17050b
Compare
mergify
bot
added
the
merge delay passed
|
This got stuck due to changes CI mandatory tests rule. Rebasing... |
|
@mergify rebase |
✅ Branch has been successfully rebased |
|
And now some randomly cancelled jobs. Let me restart. [Edit: I see @Kleidukos already did, but it's still borked. One more time...] |
Check that the numbers of *versions* output is equal to the number of pkgconf's fixes haskell#8923 The pkgconf behavior was reverted upstream in 2.0 (this should cover the case too of checking that equal pkgList lines are output also)
|
Thanks - I think it would be good to backport to 3.10 at least |
|
If we backport it. do we want to backport anything related (e.g., depending or depended upon)? |
|
Confirmed working on Windows, it queries for multiple packages. Somewhat related I found #9479. But this PR works |
|
@Kleidukos: do we want to backport this for 3.10.3? @juhp: do we need to backport anything first? any PR deps? |
|
Yes we absolutely backport this one to 3.10, thank you @Mikolaj |
|
@juhp: I assume your lack of response means we don't need to backport anything else in tandem, so let me just backport this alone. |
|
@mergify backport 3.10 |
✅ Backports have been created
|
cabal-install-solver: fix pkgconf 1.9 --modversion regression (backport #9391)
Check that the numbers of versions output is equal to the number of pkgconf's
fixes #8923
Noting that the pkgconf behavior was since reverted upstream in 2.0.
(checking that equal pkgnames are output also doesn't hurt per se, but that should be trivially true and this should cover that case too anyway)
This PR modifies
cabalbehaviourInclude the following checklist in your PR:
QA Notes
A simple testcase is building libarchive with
cabal build -f system-libarchiveand pkgconf-1.9 on Linux (eg with Fedora Linux 39)* - though any package usingpkgconfig-dependswill do.See also the original issue for more details.
(* which is how I ran into this again while trying to update ghcup version from source)