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

mecab-nodic,mecab,python3Package.uamqp,source-highlight: fix build with clang 16 #265344

Merged
merged 3 commits into from
Nov 5, 2023

Conversation

reckenrode
Copy link
Contributor

@reckenrode reckenrode commented Nov 3, 2023

Description of changes

Second batch of fixes for staging-next #263535.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.

@reckenrode reckenrode changed the title mecab-nodic,mecab,python3Package.uamqp: fix build with clang 16 mecab-nodic,mecab,python3Package.uamqp,source-highlight: fix build with clang 16 Nov 3, 2023
@ofborg ofborg bot requested review from paveloom and mwilsoncoding November 4, 2023 00:15
@ofborg ofborg bot requested a review from SuperSandro2000 November 4, 2023 00:51
Copy link
Member

@paveloom paveloom left a comment

Choose a reason for hiding this comment

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

I suggest putting this in pkgs/tools/text/mecab/base.nix (after configureFlags), since both of these derivations (default.nix and nodic.nix) derive their attribute sets from the one in base.nix. It's the same derivation, but one is with the ipadic dictionary (default.nix), and the other one is without it (nodic.nix).

pkgs/tools/text/mecab/default.nix Outdated Show resolved Hide resolved
pkgs/tools/text/mecab/nodic.nix Outdated Show resolved Hide resolved
@reckenrode reckenrode force-pushed the clang16-fixes-batch3 branch 2 times, most recently from d2a0297 to 7b7eacc Compare November 4, 2023 12:27
@ofborg ofborg bot requested a review from paveloom November 4, 2023 13:40
@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 4, 2023
Force the language mode to C++14. mecab-nodic uses several features that
have been removed from C++17.
Add a `const` to fix an incompatible function pointer conversion error.
Fetch upstream patch to add C++17 compatibility (the default in clang
16) and standardize fetchpatch URLs and hashes.
@reckenrode reckenrode force-pushed the clang16-fixes-batch3 branch from 7b7eacc to 3f99aef Compare November 4, 2023 22:10
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 4, 2023
@ofborg ofborg bot requested a review from paveloom November 5, 2023 00:07
@wegank wegank merged commit b6ba8de into NixOS:staging-next Nov 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants