diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-05 00:11:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 00:11:09 +0000 |
| commit | 789aea765853a4ba6b1abda59244e05498c3cf88 (patch) | |
| tree | c955cc494e740fa839c86fb01f857afd7e8712b3 /pkgs/data | |
| parent | f10066e81b102858d8ab757db14222d751e94d5c (diff) | |
| parent | 97ed9effd2294dda796acfca1643a184f2af21fa (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/cldr-annotations/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/data/misc/unicode-emoji/default.nix | 16 |
2 files changed, 28 insertions, 12 deletions
diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix new file mode 100644 index 0000000000000..14c8d36f28bf2 --- /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 b91afb08f60e0..9fe9ff78f8047 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 |