diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
| commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
| tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/libraries/hunspell | |
| parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
| parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
| download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/hunspell')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix index 6f834147d00b..e22c8c0a52c5 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix @@ -67,4 +67,13 @@ rec { dictFileName = "de-DE-3-0.bdic"; shortDescription = "German (Germany)"; }; + + /* FRENCH */ + + fr_FR = fr-fr; + fr-fr = mkDictFromChromium { + shortName = "fr-fr"; + dictFileName = "fr-FR-3-0.bdic"; + shortDescription = "French (France)"; + }; } diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index d62f672f0660..78c9ad7fe7b5 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -807,7 +807,7 @@ rec { meta = with lib; { description = "Hunspell dictionary for Dutch (Netherlands) from OpenTaal"; homepage = "https://www.opentaal.org/"; - license = with licenses; [ bsd3 ]; # and/or cc-by-nc-30 + license = with licenses; [ bsd3 /* or */ cc-by-30 ]; maintainers = with maintainers; [ artturin ]; }; }; @@ -828,14 +828,14 @@ rec { th_TH = th-th; th-th = mkDict { pname = "hunspell-dict-th-th"; - version = "experimental-2024-02-27"; + version = "experimental-2024-04-15"; dictFileName = "th_TH"; readmeFile = "README.md"; src = fetchFromGitHub { owner = "SyafiqHadzir"; repo = "Hunspell-TH"; - rev = "62d35f9211ca1eb4c367eac2ae57193efe6e88d2"; - sha256 = "sha256-t4m4u+qIgJPrKz58Cu2Q+knYm/+cvrNLzQsiiSRTB1A="; + rev = "419eb32115b936da9c949e35b35c29b8187f6c93"; + sha256 = "sha256-aXjof5dcEoCmep3PtvVkBhcgcd2NtqUpUEu37wsi1Uk="; }; meta = with lib; { description = "Hunspell dictionary for Central Thai (Thailand)"; |