Skip to content

Backport #10677: fix unix dependency correctly#10679

Merged
mergify[bot] merged 1 commit into3.14from
mergify/bp/3.14/pr-10677
Dec 27, 2024
Merged

Backport #10677: fix unix dependency correctly#10679
mergify[bot] merged 1 commit into3.14from
mergify/bp/3.14/pr-10677

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 26, 2024

Patching cabal.release.project still allows the buggy unix release to be installed via Hackage.

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

This is an automatic backport of pull request #10677 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Dec 26, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Dec 26, 2024

Cherry-pick of 87ce0fc has failed:

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

You are currently cherry-picking commit 87ce0fc51.
  (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)

Changes to be committed:
	modified:   Cabal/Cabal.cabal
	modified:   bootstrap/linux-9.8.2.json
	modified:   cabal-install/cabal-install.cabal

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   bootstrap/linux-9.0.2.json
	both modified:   bootstrap/linux-9.2.8.json
	both modified:   bootstrap/linux-9.4.8.json
	deleted by us:   bootstrap/linux-9.6.6.json
	both modified:   cabal.bootstrap.project
	both modified:   cabal.release.project

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

@mergify mergify bot mentioned this pull request Dec 26, 2024
2 tasks
@mergify mergify bot added the backport label Dec 26, 2024
@geekosaur
Copy link
Collaborator

I'm working on these, after a delay because I needed to get some other things done (plus needing to rebuild the bootstrap stuff and dig out older ghc versions, etc.)

@geekosaur geekosaur force-pushed the mergify/bp/3.14/pr-10677 branch from 096bd0c to f136277 Compare December 26, 2024 21:02
@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Dec 26, 2024
Patching `cabal.release.project` still allows the buggy `unix`
release to be installed via Hackage.

(cherry picked from commit 87ce0fc)
@Mikolaj Mikolaj force-pushed the mergify/bp/3.14/pr-10677 branch from f136277 to b28ee38 Compare December 26, 2024 23:28
@mergify mergify bot merged commit cf1783e into 3.14 Dec 27, 2024
56 checks passed
@mergify mergify bot deleted the mergify/bp/3.14/pr-10677 branch December 27, 2024 01:43
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.

1 participant