diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix new file mode 100644 index 000000000000..14c8d36f28bf --- /dev/null +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchzip }: + +let + version = "40.0"; +in fetchzip rec { + name = "cldr-annotations-${version}"; + + url = "https://unicode.org/Public/cldr/40/cldr-common-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/unicode/cldr + unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*' + ''; + + sha256 = "sha256-L4NSMNFYKJWV3qKQhio9eMABtDlLieT9VeMZfzeAkbM="; + + meta = with lib; { + description = "Names and keywords for Unicode characters from the Common Locale Data Repository"; + homepage = "https://cldr.unicode.org"; + license = licenses.unicode-dfs-2016; + platforms = platforms.all; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index b91afb08f60e..9fe9ff78f804 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -4,7 +4,7 @@ }: let - version = "12.1"; + version = "14.0"; fetchData = { file, sha256 }: fetchurl { url = "https://www.unicode.org/Public/emoji/${version}/${file}"; @@ -19,25 +19,17 @@ let }; srcs = { - emoji-data = fetchData { - file = "emoji-data.txt"; - sha256 = "17gfm5a28lsymx36prbjy2g0b27gf3rcgggy0yxdshbxwf6zpf9k"; - }; emoji-sequences = fetchData { file = "emoji-sequences.txt"; - sha256 = "1fckw5hfyvz5jfp2jczzx8qcs79vf0zyq0z2942230j99arq70vc"; + sha256 = "sha256-4helD/0oe+UmNIuVxPx/P0R9V10EY/RccewdeemeGxE="; }; emoji-test = fetchData { file = "emoji-test.txt"; - sha256 = "0w29lva7gp9g9lf7bz1i24qdalvf440bcq8npsbwr3cpp7na95kh"; - }; - emoji-variation-sequences = fetchData { - file = "emoji-variation-sequences.txt"; - sha256 = "0akpib3cinr8xcs045hda5wnpfj6qfdjlkzmq5vgdc50gyhrd2z3"; + sha256 = "sha256-DDOVhnFzfvowINzBZ7dGYMZnL4khyRWVzrLL95djsUg="; }; emoji-zwj-sequences = fetchData { file = "emoji-zwj-sequences.txt"; - sha256 = "0s2mvy1nr2v1x0rr1fxlsv8ly1vyf9978rb4hwry5vnr678ls522"; + sha256 = "sha256-owlGLICFkyEsIHz/DUZucxjBmgVO40A69BCJPbIYDA0="; }; }; in diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 0f4dde0a4169..4ca1e62bfb8a 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -21,7 +21,7 @@ , gtk-doc , runCommand , isocodes -, cldr-emoji-annotation +, cldr-annotations , unicode-character-database , unicode-emoji , python3 @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { "--enable-gtk4" "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" - "--with-emoji-annotation-dir=${cldr-emoji-annotation}/share/unicode/cldr/common/annotations" + "--with-emoji-annotation-dir=${cldr-annotations}/share/unicode/cldr/common/annotations" "--with-ucd-dir=${unicode-character-database}/share/unicode" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8b060c68beb..7ccdf134da66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23695,6 +23695,8 @@ with pkgs; chonburi-font = callPackage ../data/fonts/chonburi { }; + cldr-annotations = callPackage ../data/misc/cldr-annotations { }; + cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { }; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };