Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #6835 (instantiating a Hackage indefinite package with an inplace package doesn't work) #7413

Merged
merged 4 commits into from
Jun 3, 2021

Conversation

ezyang
Copy link
Contributor

@ezyang ezyang commented May 31, 2021

Fix #6835

Fixes the bug by accurately tracking when instantiations refer to
inplace packages, and adjusting previously non-inplace packages to be
inplace when this occurs. See comment in ProjectPlanning.hs for more
details.


Please include the following checklist in your PR:

Please also shortly describe how you tested your change. Bonus points for added tests!

~/Dev/cabal/dist-newstyle/build/x86_64-osx/ghc-8.10.4/cabal-install-3.5.0.0/x/cabal/build/cabal/cabal test

Also synthetic package tests

Fixes the bug by accurately tracking when instantiations refer to
inplace packages, and adjusting previously non-inplace packages to be
inplace when this occurs.  See comment in ProjectPlanning.hs for more
details.

Signed-off-by: Edward Z. Yang <[email protected]>
@ezyang ezyang requested a review from Mikolaj May 31, 2021 05:17
@Mikolaj
Copy link
Member

Mikolaj commented May 31, 2021

@danidiaz: would you like to review this PR?

@ezyang
Copy link
Contributor Author

ezyang commented May 31, 2021

CI failures are because I forgot to remove some notice-level debug output

@Mikolaj Mikolaj requested a review from danidiaz June 1, 2021 00:12
Signed-off-by: Edward Z. Yang <[email protected]>
@ezyang
Copy link
Contributor Author

ezyang commented Jun 1, 2021

Now with package tests!

@ezyang ezyang changed the title Fix #6835 Fix #6835 (instantiating a Hackage indefinite package with an inplace package doesn't work) Jun 1, 2021
Signed-off-by: Edward Z. Yang <[email protected]>
@Mikolaj
Copy link
Member

Mikolaj commented Jun 2, 2021

Repeating from IRC:

17:16 < mikolaj_> on another note, we have AppVeyor CI that sometimes fails, nothing unusual, net outages, etc., e.g., here #7413
17:16 < mikolaj_> how do we restart AppVeyor run (I can't, apparently)?
17:17 < mikolaj_> why is it using cabal 2.4.1.0? Generally, what purpose does it server? Just some general Windows testing?

@ezyang
Copy link
Contributor Author

ezyang commented Jun 2, 2021

oh wow, merge requires TWO approving reviews, intruiging

Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't tell I understand all the subtleties here, but LGTM. Thanks a lot of the extensive notes and the test. :)

@emilypi emilypi merged commit 873216f into master Jun 3, 2021
@fgaz fgaz deleted the T6358 branch June 5, 2021 19:26
@fgaz
Copy link
Member

fgaz commented Jun 5, 2021

[x] Any changes that could be relevant to users have been recorded in the changelog.

I don't see the entry though? @ezyang could you add one in another pr?

@fgaz
Copy link
Member

fgaz commented Jun 5, 2021

And this is a bugfix so:

@Mergifyio backport 3.6

@mergify
Copy link
Contributor

mergify bot commented Jun 5, 2021

Command backport 3.6: success

Backports have been created

@ezyang
Copy link
Contributor Author

ezyang commented Jun 7, 2021

I don't see the entry though? @ezyang could you add one in another pr?

Oh do we do bugfixes in changelog? I'll try to remember to do this over the weekend

@emilypi
Copy link
Member

emilypi commented Jun 7, 2021

Yeah, we do, thanks @ezyang!

ezyang added a commit that referenced this pull request Jun 8, 2021
fgaz pushed a commit that referenced this pull request Jun 11, 2021
mergify bot pushed a commit that referenced this pull request Jun 11, 2021
…m Hackage with an inplace package)

(cherry picked from commit d3b6372)
fendor pushed a commit to fendor/cabal that referenced this pull request Jun 12, 2021
fendor pushed a commit to fendor/cabal that referenced this pull request Jun 12, 2021
fgaz pushed a commit that referenced this pull request Jun 13, 2021
…m Hackage with an inplace package)

(cherry picked from commit d3b6372)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to build with backpack modules from unpacked-containers package
5 participants