Show constraint sources in dependency solver errors #10524
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
9999years
force-pushed
the
dependency-provenance
branch
2 times, most recently
from
4811a3c
to
0c8471d
Compare
9999years
added a commit
to MercuryTechnologies/cabal
that referenced
this pull request
Nov 4, 2024
We have a lot of `showType` functions that are effectively a `Pretty` instance but less composable. Let's make them proper `Pretty` instances. Split off of haskell#10524
2 tasks
9999years
force-pushed
the
dependency-provenance
branch
9 times, most recently
from
9ebbba8
to
522bec9
Compare
jasagredo
reviewed
Nov 9, 2024
cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out
Outdated
Show resolved
Hide resolved
cabal-testsuite/PackageTests/ConstraintSource/SourceRepositoryPackage/cabal.out
Show resolved
Hide resolved
|
@jasagredo just a heads-up: on the last Cabal meeting @9999years asked to not comment on their PRs while a PR is in the draft mode. I remember it because I’m guilty in it more than many! |
9999years
force-pushed
the
dependency-provenance
branch
from
522bec9
to
e52d016
Compare
9999years
changed the title
9999years
force-pushed
the
dependency-provenance
branch
2 times, most recently
from
c10bd7d
to
9854c9d
Compare
|
Needs a release note. |
9999years
force-pushed
the
dependency-provenance
branch
from
9854c9d
to
9492b41
Compare
Before:
[__0] rejecting: memory-0.18.0 (constraint from user target requires ==0.17.0)
After:
[__0] rejecting: memory-0.18.0
(constraint from cabal.project requires ==0.17.0)
9999years
force-pushed
the
dependency-provenance
branch
from
9492b41
to
b27b413
Compare
|
Added a release note and tests, addressed comments. Should be ready to go! |
geekosaur
approved these changes
Nov 19, 2024
jasagredo
reviewed
Nov 20, 2024
| import Text.PrettyPrint | ||
|
|
||
| -- | A package bundled with a `ConstraintSource`. | ||
| data WithConstraintSource pkg = |
There was a problem hiding this comment.
I see this type being used as WithContraintSource UserConstraint so I think pkg is not actually a pkg? i.e. constraintPackage is misnamed?
| @@ -135,7 +141,7 @@ defaultBuildFlags = | |||
| -- "Distribution.Client.ProjectOrchestration" | |||
| buildAction :: NixStyleFlags BuildFlags -> [String] -> GlobalFlags -> IO () | |||
| buildAction flags@NixStyleFlags{extraFlags = buildFlags, ..} targetStrings globalFlags = | |||
| withContextAndSelectors RejectNoTargets Nothing flags targetStrings globalFlags BuildCommand $ \targetCtx ctx targetSelectors -> do | |||
| withContextAndSelectors RejectNoTargets Nothing flags (map (\target -> WithConstraintSource{constraintPackage = target, constraintConstraint = ConstraintSourceCommandlineFlag}) targetStrings) globalFlags BuildCommand $ \targetCtx ctx targetSelectors -> do | |||
There was a problem hiding this comment.
Perhaps a local bind might make this line shorter?
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.
Before:
After:
First shot at #10519. Seems unavoidably large.
Builds off of #9578.
Future work: Propagate line numbers into these constraints!
Implementation strategy:
Propagate provenance (
ProjectConfigPath/ConstraintSource) into project config types (Distribution.Client.ProjectConfig,D.C.ProjectConfig.Legacy)Extract and attach that information in
D.C.ProjectConfig.findProjectPackagesAttach that information to
ProjectPackageLocation(returned fromfindProjectPackages). Note: Might be worth unifying that withPackageLocation, would make the new typePackageLocationProvenance.Use that information to write better
ConstraintSources into the solver; this is mostly implemented.Overall it seems like all the information exists, but it takes a lot of work to propagate it into the right parts of the system.