Move ConstraintSource back to cabal-install. #9642
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This uses a existential type but I am not convinced this is the right approach. Using a type variable would be much simpler but it looked a bit too invasive since the new parameter ends up propagating to |
5 tasks
andreabedini
force-pushed
the
constraint-source
branch
from
7c9f71f to
9b2d6b7
Compare
|
@mpickering Can I ask for your opinion on this? |
We must consider the path to the installed build-tool before the path to existing versions of the build tool in paths such as `extra-prog-path` or in the system path. This was previously fixed by haskell#8972 but undone by haskell#9527. This also renames `appendProgramSearchPath` to `prependProgramSearchPath` to describe correctly what that function does. Fixes haskell#9756 (cherry picked from commit 84c30c2)
Find build-tool installed programs before programs in path (backport haskell#9762)
`extra-doc-files` and `no-autogen-paths` warnings. (cherry picked from commit 28daab1)
Update .cabal files (backport haskell#9761)
- generated with
git log --pretty=oneline --no-color cabal-install-v3.10.1.0..HEAD > 3.12.prlog
- deduped
- stored WIP “release notes” file for future `cabal-install` release
Add 3.12 Cabal changelog
* Add tests for haskell#9742 `main-is` not picked up when inside a multibranch CondNode. * Fix comments * Add simplifyBranch to Distribution.Types.CondTree Goes hand in hand with with simplifyCondTree. * Make `check` deal correctly with multiple branches `cabal check` had a problem recognising fields in presence of multiple branches. This patch fixes the problem and does not meaningfully increases CI time of particularly taxing tests (like “duplicate flagged dependencies” from MemoryUsage). --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 74b1f21)
Make `check` recognise `main-is` in conditional branches (backport haskell#9768)
Per https://github.com/haskell/cabal/wiki/Updating-the-license-list to version 3.23 (2024-02-08) of SPDX License List.
Update licence list
* Bump version numbers for 3.12.0.0 Version fields, constraints, licences, and bootstrap. ☞ N.B.: - This commit removes 8.10.7 from bootstrap list. - This release only deals with Cabal, not cabal-install. * Update index state in cabal.project.release This is needed since we need the new (0.6.2.5) release of hackage-security. * Regenerate bootstrap .json files
This provides temporary life support to the `validate-old-ghcs` action until node16 will be finally axed by GHA in May 2024. Workaround for: - haskell#9858 (cherry picked from commit 2da8b2f)
CI validate-old-ghcs: pin to haskell-actions/[email protected] (backport haskell#9859)
(cherry picked from commit e7d9b84)
Bump time upper bound to acccomodate 1.14 (backport haskell#9848)
`cabal init` text for BSD-2-Clause and BSD-3-Clause licence differed slightly from the one published at SPDX. [1] [2] This caused some problems to users when dealing with licence-recognition software. [3] [1] https://spdx.org/licenses/BSD-2-Clause.html [2] https://spdx.org/licenses/BSD-3-Clause.html [3] https://discourse.haskell.org/t/non-standard-license-generated-by-stack-new/9059 (cherry picked from commit 1e86730)
5 tasks
Conform BSD-2-Clause and BSD-3-Clause text to SPDX (backport haskell#9813)
andreabedini
force-pushed
the
constraint-source
branch
from
9b2d6b7 to
ab1b0d7
Compare
Braching off the discussion at haskell#9578 (comment) The solver should not know anything about project configuration as it is only a cabal-install concept. The caller should instead be able to add arbitrary annotation to the global constraints it passes to the solver.
andreabedini
force-pushed
the
constraint-source
branch
from
ab1b0d7 to
009bcdb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Braching off this discussion: #9578 (comment)
The solver should not know anything about project configuration as it is only a cabal-install concept. The caller should instead be able to add arbitrary annotation to the global constraints it passes to the solver.