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.

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

shared-mime-info: 2.2 -> 2.3 #259727

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Conversation

tobim
Copy link
Contributor

@tobim tobim commented Oct 8, 2023

Description of changes

https://gitlab.freedesktop.org/xdg/shared-mime-info/-/releases/2.3
Also adds a patch for clang_16 compat.

Supersedes #252576.

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.

@tobim
Copy link
Contributor Author

tobim commented Oct 8, 2023

Related to #234710.

Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Upstream diff looks okay (did not check the XML file).

Also adds a patch for clang_16 compat.
@tobim
Copy link
Contributor Author

tobim commented Oct 10, 2023

The clang16 patches have been merged upstream and there is still an open MR to update the changelog and the version number: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/250/diffs?commit_id=e24fe6127370880596b9f06a4dd4a671ad530f85
Nevermind, that was already merged.

I'll set this to draft for now in case the tag will be rewritten.

@tobim tobim marked this pull request as draft October 10, 2023 07:30
@tobim tobim marked this pull request as ready for review October 10, 2023 07:33
@toonn toonn merged commit 6bf753a into NixOS:staging Oct 11, 2023
13 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants