Skip to content

xterm: 383 -> 384#244141

Merged
7c6f434c merged 1 commit intoNixOS:stagingfrom
trofi:xterm-update
Jul 18, 2023
Merged

xterm: 383 -> 384#244141
7c6f434c merged 1 commit intoNixOS:stagingfrom
trofi:xterm-update

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jul 18, 2023 •
edited
Loading

Changes: https://invisible-island.net/xterm/xterm.log.html#xterm_384

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from NeQuissimus and vrthra July 18, 2023 11:00
@ofborg ofborg bot added 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. labels Jul 18, 2023
@7c6f434c
Copy link
Member

7c6f434c commented Jul 18, 2023

@ofborg build xterm

@7c6f434c 7c6f434c merged commit d2cb388 into NixOS:staging Jul 18, 2023
@trofi trofi deleted the xterm-update branch July 18, 2023 17:08
@henrirosten
Copy link
Member

henrirosten commented Aug 25, 2023 •
edited
Loading

Adding security label based on https://nvd.nist.gov/vuln/detail/CVE-2023-40359, in order to backport this to 23.05.

@henrirosten henrirosten added 1.severity: security Issues which raise a security issue, or PRs that fix one backport staging-23.05 labels Aug 25, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 25, 2023

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

Please cherry-pick the changes locally.

git fetch origin staging-23.05
git worktree add -d .worktree/backport-244141-to-staging-23.05 origin/staging-23.05
cd .worktree/backport-244141-to-staging-23.05
git checkout -b backport-244141-to-staging-23.05
ancref=$(git merge-base 06e7a18235e7f9bda0207a0e8018a74d36dca0f9 ba2eae1629ee81ee8fd79c3c224fe189b44bd4fa)
git cherry-pick -x $ancref..ba2eae1629ee81ee8fd79c3c224fe189b44bd4fa

@henrirosten henrirosten mentioned this pull request Sep 11, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ambroisie ambroisie ambroisie approved these changes

@NeQuissimus NeQuissimus Awaiting requested review from NeQuissimus

@vrthra vrthra Awaiting requested review from vrthra

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 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.

4 participants

@trofi @7c6f434c @henrirosten @ambroisie