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

libreoffice, hyphen: Load hyphen dicts in LibreOffice, modularize hyphen dicts, add german hyphen dict #325290

Merged
merged 5 commits into from
Jul 9, 2024

Conversation

theCapypara
Copy link
Contributor

@theCapypara theCapypara commented Jul 7, 2024

Description of changes

Fixes parts of #14430

Let me know if I should split this PR! I needed all these things so I added and tested them together.

  1. Makes sure that all hyphen dictionaries are loaded for LibreOffice (1st commit)
  2. Adds a new package group hyphenDicts that follows the same principle as hunspellDicts (2nd commit)
  3. Removes the en_US dict from hyphen and moves it to hyphenDicts.en_US (2nd commit)
  4. Adds the hyphen dictionaries de_DE, de_CH, de_AT

NOTE: This is a breaking change, as hyphen now no longer contains the en_US dictionary.

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@theCapypara
Copy link
Contributor Author

@Br1ght0ne for hyphen
I'm not really sure who to tag for libreoffice, there is no GitHub user named "raskin"... @7c6f434c is that you? Sorry if not!

@7c6f434c
Copy link
Member

7c6f434c commented Jul 7, 2024

Yes, as described in maintainer-list.nix, but maybe I should just make everything uniform… it's not like any plausible future hosting platform is likely to have a name collision for 7c6f434c.

Copy link
Member

@7c6f434c 7c6f434c left a comment

Choose a reason for hiding this comment

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

Looks good to me, but I want to see ofBorg builds and also if there are unexpected rev-deps for hyphen

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jul 7, 2024
@7c6f434c
Copy link
Member

7c6f434c commented Jul 7, 2024

Oh right, to add yourself as a maintainer you should also add yourself to the maintainer-list.nix

@theCapypara
Copy link
Contributor Author

Oh, alright! Didn't know that existed, first time contributor and all. Will have a look!

@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Jul 8, 2024
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jul 8, 2024
@7c6f434c
Copy link
Member

7c6f434c commented Jul 8, 2024

Typo revealed by ofBorg eval error

@theCapypara
Copy link
Contributor Author

Oh wow, whoops.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jul 9, 2024
@ofborg ofborg bot requested a review from Br1ght0ne July 9, 2024 07:52
@7c6f434c 7c6f434c merged commit ddbd789 into NixOS:master Jul 9, 2024
29 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants