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

Jump to bottom

hunspellDict.fr-any: Link fr-moderne.dic to fr_FR.dic #47153

Merged
merged 2 commits into from May 23, 2019
Merged

hunspellDict.fr-any: Link fr-moderne.dic to fr_FR.dic #47153

merged 2 commits into from May 23, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Sep 21, 2018 •
edited

Motivation for this change

See #46940

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@Ma27 Ma27 changed the title Link fr-toutesvariantes.dic to fr_FR.dic to hunspellDict.fr-any hunspellDict.fr-any: Link fr-toutesvariantes.dic to fr_FR.dic Sep 21, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: hunspellDicts.fr-any, ibus-engines.typing-booster

Partial log (click to expand)

  inflating: README.txt
 extracting: es_ES.aff
 extracting: es_ES.dic
installing
'/nix/store/qhdnjnm91mcx6gli4gghjjww1jd1ip9m-hunspell-dict-es-es-rla-2.2/share/myspell/dicts/es_ES.dic' -> '/nix/store/qhdnjnm91mcx6gli4gghjjww1jd1ip9m-hunspell-dict-es-es-rla-2.2/share/hunspell/es_ES.dic'
'/nix/store/qhdnjnm91mcx6gli4gghjjww1jd1ip9m-hunspell-dict-es-es-rla-2.2/share/myspell/dicts/es_ES.aff' -> '/nix/store/qhdnjnm91mcx6gli4gghjjww1jd1ip9m-hunspell-dict-es-es-rla-2.2/share/hunspell/es_ES.aff'
copying path '/nix/store/5j0c94l0yjbq34a5a8y43s7dnidlrl0h-ibus-typing-booster-2.1.1' from 'https://cache.nixos.org'...
building '/nix/store/xj5094wczg7wxfvp3kqynafp7mzcizfw-ibus-typing-booster-2.1.1-with-hunspell.drv'...
/nix/store/l5m6l6yd4hqkyp77krq95ix2sgcc72ba-hunspell-dict-fr-any-dicollecte-5.3
/nix/store/kxy9ynb2h3rccgnlaqs0d4lsspn8myp1-ibus-typing-booster-2.1.1-with-hunspell

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: hunspellDicts.fr-any, ibus-engines.typing-booster

Partial log (click to expand)

strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dx498490ylglb6jk5wpdiq6czq1c1cyv-ibus-typing-booster-2.1.1/libexec  /nix/store/dx498490ylglb6jk5wpdiq6czq1c1cyv-ibus-typing-booster-2.1.1/bin
patching script interpreter paths in /nix/store/dx498490ylglb6jk5wpdiq6czq1c1cyv-ibus-typing-booster-2.1.1
/nix/store/dx498490ylglb6jk5wpdiq6czq1c1cyv-ibus-typing-booster-2.1.1/libexec/.ibus-engine-typing-booster-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/dx498490ylglb6jk5wpdiq6czq1c1cyv-ibus-typing-booster-2.1.1/libexec/.ibus-setup-typing-booster-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/dx498490ylglb6jk5wpdiq6czq1c1cyv-ibus-typing-booster-2.1.1/bin/.emoji-picker-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/dx498490ylglb6jk5wpdiq6czq1c1cyv-ibus-typing-booster-2.1.1...
building '/nix/store/jm3mmcc76s74anpb7yi87x4yrdhy73xp-ibus-typing-booster-2.1.1-with-hunspell.drv'...
/nix/store/zbsyiqqli4j1738mfm57lkbam3fwsckw-hunspell-dict-fr-any-dicollecte-5.3
/nix/store/f794mrr013dhxh6gr6p0h6q3phl28gjd-ibus-typing-booster-2.1.1-with-hunspell

@Ma27
Copy link
Member Author

Ma27 commented Oct 26, 2018

fixed and rebased onto master.

@Ma27 Ma27 changed the title hunspellDict.fr-any: Link fr-toutesvariantes.dic to fr_FR.dic hunspellDict.fr-any: Link fr-moderne.dic to fr_FR.dic Oct 30, 2018
@Ma27
Copy link
Member Author

Ma27 commented Feb 25, 2019

Ping @symphorien @jtojnar

@worldofpeace
Copy link
Contributor

@Ma27 I don't see any reasons here for this not to be merged.

19.03 has past now, can we have the release note in 19.09?

Ma27 added 2 commits May 23, 2019 15:53
@Ma27
hunspellDicts.fr-any: link fr-moderne to fr_FR
a9d67d5 
Some packages like `ibus-engines.typing-booster` require the dictionary
`fr_FR.dic` to provide proper support for the french language.

Until now the hunspell package set of nixpkgs didn't provide this
dictionary. It has been recommended to use `fr-moderne` as base and link
`fr_FR.dic` from it as done by other distros such as ArchLinux.

See NixOS#46940 (comment)

Fixes NixOS#46940
@Ma27
ibus-engines.typing-booster: support french by default
77d8f5c 
This has been postponed[1] because of an unclear state of the french
dictionary provided by hunspell[2].

[1] NixOS#46779 (comment)
[2] NixOS#46940 (comment)
@Ma27 Ma27 force-pushed the hunspell-fr_FR-dictionary branch from 2fca82e to 77d8f5c Compare May 23, 2019 13:56
@Ma27
Copy link
Member Author

Ma27 commented May 23, 2019

@worldofpeace fixed

@ofborg ofborg bot requested a review from dywedir May 23, 2019 15:21
@worldofpeace worldofpeace merged commit 713bbb7 into NixOS:master May 23, 2019
@Ma27 Ma27 deleted the hunspell-fr_FR-dictionary branch May 23, 2019 17:30
@worldofpeace
Copy link
Contributor

Thanks for fixing this @Ma27 ✨ Especially so because you noted that you don't speak french.

@Ma27 Ma27 mentioned this pull request May 23, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@symphorien symphorien symphorien left review comments

@dywedir dywedir Awaiting requested review from dywedir

Assignees
No one assigned
Labels
2.status: work-in-progress 6.topic: nixos 8.has: changelog 8.has: documentation 9.needs: community feedback 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Ma27 @GrahamcOfBorg @worldofpeace @symphorien @jtojnar