Skip to content

zstd: 1.5.4 → 1.5.5#224738

Merged
trofi merged 1 commit intoNixOS:stagingfrom
andersk:zstd
Apr 11, 2023
Merged

zstd: 1.5.4 → 1.5.5#224738
trofi merged 1 commit intoNixOS:stagingfrom
andersk:zstd

Conversation

@andersk
Copy link
Copy Markdown
Contributor

@andersk andersk commented Apr 5, 2023 •
edited
Loading

Description of changes

This release fixes a rare but serious corruption bug.

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.05 Release Notes (or backporting 22.11 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.

@andersk
zstd: 1.5.4 → 1.5.5
72e952e 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@viraptor
Copy link
Copy Markdown
Contributor

viraptor commented Apr 5, 2023

I think you accidentally converted -> into a a unicode symbol. This should be plain ascii to play nicely with tooling.

@viraptor viraptor mentioned this pull request Apr 5, 2023
Closed
12 tasks
@zowoq
Copy link
Copy Markdown
Contributor

zowoq commented Apr 5, 2023 •
edited
Loading

This should be plain ascii to play nicely with tooling.

Which tooling?

maintainers/scripts/update.nix uses unicode:

nixpkgs/maintainers/scripts/update.py

Line 103 in 7884a01

commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change)

@viraptor
Copy link
Copy Markdown
Contributor

viraptor commented Apr 5, 2023

Mine :)
That does not match the contributing doc, so it was surprising: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#submitting-changes I'll post a PR to asciify and see what's the consensus...

@andersk
Copy link
Copy Markdown
Contributor Author

andersk commented Apr 5, 2023

I use a Unicode → intentionally, and I’m not the only one.

❯ git log --oneline --grep=→ | wc -l
5730

If it breaks your tooling, consider fixing your tooling?

@viraptor
Copy link
Copy Markdown
Contributor

viraptor commented Apr 5, 2023

Offtopic here, relevant PR at #224746

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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. labels Apr 5, 2023
@andersk
Copy link
Copy Markdown
Contributor Author

andersk commented Apr 5, 2023

(Does this need to go through staging due to the rebuild count?)

@Artturin
Copy link
Copy Markdown
Member

Artturin commented Apr 5, 2023

(Does this need to go through staging due to the rebuild count?)

Yes

@andersk andersk changed the base branch from master to staging April 5, 2023 02:23
@ajs124 ajs124 requested a review from orivej-nixos April 5, 2023 18:24
@nixos-discourse
Copy link
Copy Markdown

nixos-discourse commented Apr 11, 2023

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2060

@trofi trofi merged commit 116d2af into NixOS:staging Apr 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@orivej-nixos orivej-nixos Awaiting requested review from orivej-nixos

1 more reviewer

@trofi trofi trofi approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@andersk @viraptor @zowoq @Artturin @nixos-discourse @trofi