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.

Sign up for GitHub

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

Jump to bottom

Revert "neovim: 0.9.5 -> 0.10.0" #313359

Merged
merged 3 commits into from
May 21, 2024
Merged

Revert "neovim: 0.9.5 -> 0.10.0" #313359

merged 3 commits into from
May 21, 2024

Conversation

RaitoBezarius
Copy link
Member

@RaitoBezarius RaitoBezarius commented May 21, 2024 •
edited
Loading

Please refer to #303285.

Reverts #311047 as it was not supposed to happen for this release cycle.

A full message is provided in the commit message.

@mweinelt mweinelt requested review from teto and removed request for kevincox May 21, 2024 10:20
@RaitoBezarius
Revert "neovim: 0.9.5 -> 0.10.0"
db2ee05 
The release schedule indicate that breaking changes are restricted
during this period, 752d81e ("neovim:
0.9.5 -> 0.10.0") was merged five days ago, full of breaking changes for
the NeoVim ecosystem.

This PR should go *after* the branch-off.
@natsukium
Copy link
Member

I guess we need to revert these related PRs.
#312312 @bew
#312630 @PriceHiller

GaetanLepage
GaetanLepage approved these changes May 21, 2024
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

Sorry for this. I haven't paid enough attention to the release schedule.
I will take care of re-submitting it after the branch-off.

@ofborg ofborg bot requested review from manveru and rvolosatovs May 21, 2024 11:16
@RaitoBezarius
Copy link
Member Author

I guess we need to revert these related PRs. #312312 @bew #312630 @PriceHiller

Can you push the revert commits on this PR additionally and provide a reason for their reverts as well?

@PriceHiller
Copy link
Contributor

I guess we need to revert these related PRs. #312312 @bew #312630 @PriceHiller

Can you push the revert commits on this PR additionally and provide a reason for their reverts as well?

Can do in about an hour when I'm at a computer.

PriceHiller added a commit to PriceHiller/nixpkgs that referenced this pull request May 21, 2024
@PriceHiller
Revert "neovide: 0.12.2 -> 0.13.0"
032b688 
Reverts `0fe111d`.

The release schedule makes breaking changes restricted during this period.
Neovide `0.13.0` incorporates a breaking change, making no-fork the
default behavior. An update to Neovide should only be incorporated
*after* the branch-off.

See NixOS#313359 for more info.
@PriceHiller
Copy link
Contributor

@RaitoBezarius

Not sure that I have perms to push onto your PR -- feel free to incorporate my revert commit seperate from me or point me to what I need to do to get those perms.

Thanks 🙂.

I'll likewise track for the next release cycle to update Neovide.

@natsukium
Revert "neovim: Update bundled tree-sitter parsers"
76ef4c7 
This reverts commit 7f4c36c.

neovim was accidentally bumped during the freeze period before release
with breaking changes.
This commit is related to neovim 0.10, so it is reverted for now.
@natsukium
Revert "neovide: 0.12.2 -> 0.13.0"
9408377 
This reverts commit 0fe111d.

neovim was accidentally bumped during the freeze period before release
with breaking changes.
This commit is related to neovim 0.10, so it is reverted for now.
@natsukium
Copy link
Member

I have reverted those two commits.

@PriceHiller
You need to become a committer to push your commits to PRs by others.

@ofborg ofborg bot requested a review from ck3d May 21, 2024 16:33
@wegank wegank merged commit 19d3279 into master May 21, 2024
20 checks passed
@wegank wegank deleted the revert-311047-neovim branch May 21, 2024 22:46
This was referenced May 22, 2024
Closed
Merged
@andrevmatos
Copy link
Member

From what I can see, the release branches and channels are expected to be created today, so this can be re-reverted then, right? What a bummer this didn't make into the release, but thank Nix for flake locks.

@wegank
Copy link
Member

wegank commented May 22, 2024

Yes, this PR can be reverted on master after branch-off.

@andrevmatos andrevmatos mentioned this pull request May 22, 2024
Merged
@adamcstephens
Copy link
Contributor

Thanks @RaitoBezarius for reverting. While I'd love 0.10 in 24.05, the upgrade definitely broke things.

@RaitoBezarius
Copy link
Member Author

No problem, you're welcome! Thanks for everyone's understanding on this matter and swift resolution, you all are amazing :)

@eclairevoyant eclairevoyant mentioned this pull request May 23, 2024
Closed
@natsukium natsukium mentioned this pull request Jun 7, 2024
Closed
1 task
@natsukium natsukium mentioned this pull request Jun 20, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GaetanLepage GaetanLepage GaetanLepage approved these changes

@teto teto Awaiting requested review from teto

@kevincox kevincox Awaiting requested review from kevincox

@thiagokokada thiagokokada Awaiting requested review from thiagokokada

@manveru manveru Awaiting requested review from manveru

@rvolosatovs rvolosatovs Awaiting requested review from rvolosatovs

@ck3d ck3d Awaiting requested review from ck3d

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@RaitoBezarius @natsukium @PriceHiller @andrevmatos @wegank @adamcstephens @rvolosatovs @GaetanLepage