git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #166160 from DeeUnderscore/misc/ibus-emoji-14

unicode-emoji: 12.1 -> 14.0; cldr-common: init at 40.0; ibus: update for Emoji 14

commit85d32acd32ddb136a3130a001d3571552998e2e4 authorThomas Tuegel <ttuegel@mailbox.org> dateMon 4 Apr 2022, 09:42 (5 years ago) parent149f31a6ae3cfc
4 files changed+32−14
compare with master
unifiedsplit
pkgs/data/misc/cldr-annotations/default.nix+24 pkgs/data/misc/unicode-emoji/default.nix+4−12 pkgs/tools/inputmethods/ibus/default.nix+2−2 pkgs/top-level/all-packages.nix+2
pkgs/data/misc/cldr-annotations/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ lib, fetchzip }:
2+
3+let
4+ version = "40.0";
5+in fetchzip rec {
6+ name = "cldr-annotations-${version}";
7+
8+ url = "https://unicode.org/Public/cldr/40/cldr-common-${version}.zip";
9+
10+ postFetch = ''
11+ mkdir -p $out/share/unicode/cldr
12+ unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*'
13+ '';
14+
15+ sha256 = "sha256-L4NSMNFYKJWV3qKQhio9eMABtDlLieT9VeMZfzeAkbM=";
16+
17+ meta = with lib; {
18+ description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
19+ homepage = "https://cldr.unicode.org";
20+ license = licenses.unicode-dfs-2016;
21+ platforms = platforms.all;
22+ maintainers = with maintainers; [ DeeUnderscore ];
23+ };
24+}
pkgs/data/misc/unicode-emoji/default.nix+4−12
@@ -4,7 +4,7 @@
44}:
55
66let
7− version = "12.1";
7+ version = "14.0";
88
99 fetchData = { file, sha256 }: fetchurl {
1010 url = "https://www.unicode.org/Public/emoji/${version}/${file}";
@@ -19,25 +19,17 @@ let
1919 };
2020
2121 srcs = {
22− emoji-data = fetchData {
23− file = "emoji-data.txt";
24− sha256 = "17gfm5a28lsymx36prbjy2g0b27gf3rcgggy0yxdshbxwf6zpf9k";
25− };
2622 emoji-sequences = fetchData {
2723 file = "emoji-sequences.txt";
28− sha256 = "1fckw5hfyvz5jfp2jczzx8qcs79vf0zyq0z2942230j99arq70vc";
24+ sha256 = "sha256-4helD/0oe+UmNIuVxPx/P0R9V10EY/RccewdeemeGxE=";
2925 };
3026 emoji-test = fetchData {
3127 file = "emoji-test.txt";
32− sha256 = "0w29lva7gp9g9lf7bz1i24qdalvf440bcq8npsbwr3cpp7na95kh";
33− };
34− emoji-variation-sequences = fetchData {
35− file = "emoji-variation-sequences.txt";
36− sha256 = "0akpib3cinr8xcs045hda5wnpfj6qfdjlkzmq5vgdc50gyhrd2z3";
28+ sha256 = "sha256-DDOVhnFzfvowINzBZ7dGYMZnL4khyRWVzrLL95djsUg=";
3729 };
3830 emoji-zwj-sequences = fetchData {
3931 file = "emoji-zwj-sequences.txt";
40− sha256 = "0s2mvy1nr2v1x0rr1fxlsv8ly1vyf9978rb4hwry5vnr678ls522";
32+ sha256 = "sha256-owlGLICFkyEsIHz/DUZucxjBmgVO40A69BCJPbIYDA0=";
4133 };
4234 };
4335in
pkgs/tools/inputmethods/ibus/default.nix+2−2
@@ -21,7 +21,7 @@
2121, gtk-doc
2222, runCommand
2323, isocodes
24−, cldr-emoji-annotation
24+, cldr-annotations
2525, unicode-character-database
2626, unicode-emoji
2727, python3
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
106106 "--enable-gtk4"
107107 "--enable-install-tests"
108108 "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji"
109− "--with-emoji-annotation-dir=${cldr-emoji-annotation}/share/unicode/cldr/common/annotations"
109+ "--with-emoji-annotation-dir=${cldr-annotations}/share/unicode/cldr/common/annotations"
110110 "--with-ucd-dir=${unicode-character-database}/share/unicode"
111111 ];
112112
pkgs/top-level/all-packages.nix+2
@@ -23695,6 +23695,8 @@ with pkgs;
2369523695
2369623696 chonburi-font = callPackage ../data/fonts/chonburi { };
2369723697
23698+ cldr-annotations = callPackage ../data/misc/cldr-annotations { };
23699+
2369823700 cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { };
2369923701
2370023702 clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };