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

Lookup hunspell dictionaries in XDG_DATA_DIRS #65349

Merged
merged 2 commits into from Aug 14, 2019

Conversation

@matthewbauer
Copy link
Member

commented Jul 24, 2019

Adds a patch to support XDG_DATA_DIRS in hunspell.

Motivation for this change
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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

matthewbauer added some commits Jul 24, 2019

hunspellDicts: add aliases for each dictionary
This adds LANG aliases for each dictionary. This makes things a little
easier and expected. For instance, you get an error message from
hunspell like:

  Can't open affix or dictionary files for dictionary named "en_US".

and you can resolve it by running

  nix-env -iA nixpkgs.hunspellDicts.en_US

@matthewbauer matthewbauer force-pushed the matthewbauer:dicts branch from 9c99c40 to ed06097 Jul 24, 2019

@FRidh

This comment has been minimized.

Copy link
Member

commented Aug 3, 2019

How is this done with other dictionaries, such as aspell? Also, what if I do not want such impurity? I suppose it could be wrapped with set XDG_DATA_DIRS=. See e.g. #26622 for aspell.

@matthewbauer

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2019

How is this done with other dictionaries, such as aspell? Also, what if I do not want such impurity? I suppose it could be wrapped with set XDG_DATA_DIRS=. See e.g. #26622 for aspell.

aspell uses NIX_PROFILES, which has a similar effect, but less standardized than XDG_DATA_DIRS. You can always unset XDG_DATA_DIRS if you don't want hunspell to look there (also need to unset DICPATH and DICTIONARY)

@Provessor

This comment has been minimized.

Copy link

commented Aug 11, 2019

Builds and works as intended on NixOS and removes the need to set $DICPATH or $DICTIONARY for hunspell to find the installed dictionaries on my machine.

aspell uses NIX_PROFILES, which has a similar effect, but less standardized than XDG_DATA_DIRS

Using $NIX_PROFILE may be slightly better to match aspell, or alter the patch so it will use both and not be reliant on XDG. Or even only check in the Nix specific directories (i.e. ~/.nix-profile/share/hunspell, etc.).

Commit ed06097 is not properly documented. It's some slight QoL improvements, unrelated to the purpose of this PR and mostly useless.

@matthewbauer matthewbauer merged commit 9af20c3 into NixOS:master Aug 14, 2019

16 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
hunspell on aarch64-linux Success
Details
hunspell on x86_64-darwin Success
Details
hunspell on x86_64-linux Success
Details
@averelld averelld referenced this pull request Aug 15, 2019
4 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.