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

cabal-install: Fix non-reinstallable package set (backport #9092) #9141

Merged
merged 3 commits into from
Jul 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 20, 2023

This is an automatic backport of pull request #9092 done by Mergify.
Cherry-pick of 2e32a44 has failed:

On branch mergify/bp/3.10/pr-9092
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit 2e32a44f2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install/src/Distribution/Client/Dependency.hs

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 249374d has failed:

On branch mergify/bp/3.10/pr-9092
Your branch is ahead of 'origin/3.10' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 249374d16.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@Kleidukos
Copy link
Member

@Mergifyio squash

)

cabal-install: Fix non-reinstallable package set

In #9064 we discovered that `ghc-boot` was added to the
non-reinstallable package set due to #8051 despite there being no
reason why it can't be built from its source distribution. This
revealed the fact that there is quite some ambiguity around what
constitutes a non-reinstallable package.

In #9064 we worked out a hopefully-more-clear picture of
non-reinstallability. Here we update the commentary to describe this
concept and update the lists to reflect the new definition.

Closes #9064.

(cherry picked from commit 2e32a44)

# Conflicts:
#	cabal-install/src/Distribution/Client/Dependency.hs

* Fix tests

(cherry picked from commit 249374d)

# Conflicts:
#	cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs

* Fix conflicts
@mergify
Copy link
Contributor Author

mergify bot commented Jul 20, 2023

squash

✅ Pull request squashed successfully

@Kleidukos Kleidukos added the merge me Tell Mergify Bot to merge label Jul 20, 2023
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.

LGTM

@mergify mergify bot merged commit bcabe6f into 3.10 Jul 26, 2023
@mergify mergify bot deleted the mergify/bp/3.10/pr-9092 branch July 26, 2023 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants