Skip to content

slack: 4.34.115 -> 4.34.120#257135

Merged
delroth merged 1 commit intoNixOS:masterfrom
SebTM:slack_434120
Sep 24, 2023
Merged

slack: 4.34.115 -> 4.34.120#257135
delroth merged 1 commit intoNixOS:masterfrom
SebTM:slack_434120

Conversation

@SebTM
Copy link
Contributor

@SebTM SebTM commented Sep 24, 2023 •
edited
Loading

Description of changes

Includes not further specified security-update (https://slack.com/intl/de-de/release-notes/linux) with following specification:

This release includes security improvements. Updating is recommended. | Some security improvements. Upgrading will provide users with security benefits.

Might need a Backport to 23.05 also. // cc @delroth

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.

@delroth delroth added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-23.05 labels Sep 24, 2023
@delroth delroth mentioned this pull request Sep 24, 2023
Closed
90 tasks
@delroth
Copy link
Contributor

delroth commented Sep 24, 2023

How about the versions for other platforms? Did they not get an update?

@SebTM
Copy link
Contributor Author

SebTM commented Sep 24, 2023

How about the versions for other platforms? Did they not get an update?

They did, fixed - unsure about the message but seems unreasonable to skip security-updates because release-numbers are out-of-sync if that has no different impact?

delroth
delroth approved these changes Sep 24, 2023
View reviewed changes
Copy link
Contributor

@delroth delroth left a comment

Choose a reason for hiding this comment

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

Change looks fine and builds on x86_64-linux. Could wait for ofborg eval to complete out of caution, but given the diff, I find it very unlikely that anything would break.

@delroth
Copy link
Contributor

delroth commented Sep 24, 2023

Also, since this isn't mentioned otherwise in this PR: usually r-ryantm and the updaterScript would take care of those bumps, but it seems like this particular update.sh bails out if Linux and Darwin versions are not in sync (not sure why?). This is why no auto-update PR from r-ryantm got created for this version bump.

@delroth delroth merged commit 774c35c into NixOS:master Sep 24, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 24, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-23.05
git worktree add -d .worktree/backport-257135-to-release-23.05 origin/release-23.05
cd .worktree/backport-257135-to-release-23.05
git checkout -b backport-257135-to-release-23.05
ancref=$(git merge-base d3e8006356d89b3b8842622e9234a4e7237afa65 d83fafb0b90fe30966f279d3dc562c8b40f66a49)
git cherry-pick -x $ancref..d83fafb0b90fe30966f279d3dc562c8b40f66a49

@bjornfor
Copy link
Contributor

bjornfor commented Sep 24, 2023

Result of nixpkgs-review pr 257135 run on x86_64-linux 1

1 package built:
  • slack

@SebTM
Copy link
Contributor Author

SebTM commented Sep 24, 2023

(not sure why?).
@delroth If you agree with it I would create an MR to remove this limitation

Can also take care of the backport-MR if you like to

@delroth
Copy link
Contributor

delroth commented Sep 24, 2023

Please do! (feel free to cc me for reviews)

@SebTM SebTM deleted the slack_434120 branch September 24, 2023 22:08
@SebTM SebTM mentioned this pull request Sep 24, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjornfor bjornfor bjornfor approved these changes

+1 more reviewer

@delroth delroth delroth approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@SebTM @delroth @bjornfor