Skip to content

vim: 8.2.3877 -> 8.2.4186#155587

Merged
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
FliegendeWurst:vim-4141
Jan 23, 2022
Merged

vim: 8.2.3877 -> 8.2.4186#155587
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
FliegendeWurst:vim-4141

Conversation

@FliegendeWurst
Copy link
Member

@FliegendeWurst FliegendeWurst commented Jan 19, 2022 •
edited by SuperSandro2000
Loading

Motivation for this change

Update to latest vim version. Fixes security issues in #155354.

fixes #155354

Edit: rebased to staging..

Things done
  • Built on platform(s)
    • x86_64-linux
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: vim Advanced text editor label Jan 19, 2022
@FliegendeWurst FliegendeWurst added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-21.11 labels Jan 19, 2022
@FliegendeWurst FliegendeWurst changed the base branch from master to staging January 19, 2022 09:32
@ofborg ofborg bot added 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels Jan 19, 2022
@ofborg ofborg bot requested review from equirosa and lovek323 January 19, 2022 10:30
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 19, 2022
@FliegendeWurst FliegendeWurst removed 8.has: package (new) This PR adds a new package 8.has: clean-up This PR removes packages or removes other cruft labels Jan 19, 2022
SuperSandro2000
SuperSandro2000 approved these changes Jan 20, 2022
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

diff LGTM

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 23, 2022

Or #156132 ?

@SuperSandro2000 SuperSandro2000 mentioned this pull request Jan 23, 2022
Closed
@FliegendeWurst
Copy link
Member Author

FliegendeWurst commented Jan 23, 2022

@r-ryantm didn't update to v8.2.4186, I'll update this PR.

@FliegendeWurst FliegendeWurst changed the title vim: 8.2.3877 -> 8.2.4141 vim: 8.2.3877 -> 8.2.4186 Jan 23, 2022
@SuperSandro2000 SuperSandro2000 merged commit dfd26c6 into NixOS:staging Jan 23, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Jan 23, 2022

Backport failed for staging-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-155587-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-155587-to-staging-21.11
git checkout -b backport-155587-to-staging-21.11
ancref=$(git merge-base f681a690fb3b144c2a081e61682e09d8c4422fd9 ea5a1dd5e7c0afb3c14e1a27e3d2ebfaef9ff52b)
git cherry-pick -x $ancref..ea5a1dd5e7c0afb3c14e1a27e3d2ebfaef9ff52b

@FliegendeWurst
Copy link
Member Author

FliegendeWurst commented Jan 24, 2022

Backport: #156452

vcunat pushed a commit that referenced this pull request Jan 24, 2022
@FliegendeWurst @vcunat
vim: 8.2.3877 -> 8.2.4186 (security)
fde0b2e 
(cherry picked from staging commit ea5a1dd, PR #155587)
I believe this qualifies for staging-next; rebuilds aren't that huge,
and they look relatively cheap (mostly vim plugins).
@FliegendeWurst FliegendeWurst deleted the vim-4141 branch January 14, 2025 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@jonringer jonringer Awaiting requested review from jonringer

@equirosa equirosa Awaiting requested review from equirosa

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: vim Advanced text editor 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@FliegendeWurst @SuperSandro2000