From 4102707f9a462e67dd31c3c8a647901d4894f9b8 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Tue, 30 Jun 2020 07:54:00 +0800 Subject: [PATCH 1/3] edukai: Init at 4.0 Add `edukai` (MOE Standard Kai Font) version 4.0 If approved, users will be able to install the Standard Chinese Kai Font provided by the Ministry of Education, Republic of China (Taiwan). --- pkgs/data/fonts/edukai/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/fonts/edukai/default.nix diff --git a/pkgs/data/fonts/edukai/default.nix b/pkgs/data/fonts/edukai/default.nix new file mode 100644 index 00000000000..d5b9e25c2eb --- /dev/null +++ b/pkgs/data/fonts/edukai/default.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "edukai"; + version = "4.0"; + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-4.0.zip"; + sha256 = "10m9srvbazvg9gc43943dc89rjzcfc8mm4lx9gb5hnplrn22zrcn"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + mv *.ttf $out/share/fonts/ + ''; + + meta = { + description = + "The MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Standard Kai Font is a kai (regular srcipt) font + provided by + the Midistry of Education, Republic of China (Taiwan). + It currently includes 13,076 Chinese characters. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=47"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b93b673cce3..5b16cf22924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18296,6 +18296,8 @@ in eb-garamond = callPackage ../data/fonts/eb-garamond { }; + edukai = callPackage ../data/fonts/edukai { }; + elliptic_curves = callPackage ../data/misc/elliptic_curves { }; equilux-theme = callPackage ../data/themes/equilux-theme { }; From 8ca49923c6be434fae55e6e2637c757eefdd84b5 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:49:09 +0800 Subject: [PATCH 2/3] edusong: Init at 1.0 Add `edusong` (MOE Standard Song Font) If approved, users will be able to install the Standard Chinese Song Font provided by the Ministry of Education, Republic of China (Taiwan). --- pkgs/data/fonts/edusong/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/data/fonts/edusong/default.nix diff --git a/pkgs/data/fonts/edusong/default.nix b/pkgs/data/fonts/edusong/default.nix new file mode 100644 index 00000000000..bf7d39aa20c --- /dev/null +++ b/pkgs/data/fonts/edusong/default.nix @@ -0,0 +1,32 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "edusong"; + version = "1.0"; # The upstream doesn't provide the version + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip"; + sha256 = "1b74wj9hdzlnrvldwlkh21sfhqxwh9qghf1k0fv66zs6n48vb0d4"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + mv *.ttf $out/share/fonts/ + ''; + + meta = { + description = + "The MOE Standard Song Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Standard Song Font is a Chinese Song font provided by + the Midistry of Education, Republic of China (Taiwan). + Song or Ming is a category of CKJ typefaces in print. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=48"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b16cf22924..1cc62762eb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18298,6 +18298,8 @@ in edukai = callPackage ../data/fonts/edukai { }; + edusong = callPackage ../data/fonts/edusong { }; + elliptic_curves = callPackage ../data/misc/elliptic_curves { }; equilux-theme = callPackage ../data/themes/equilux-theme { }; From b2872b921d02b7da9d46b272d5a27cc672267528 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:25:28 +0800 Subject: [PATCH 3/3] eduli: Init at 3.0 Add `eduli` (MOE Li Font) If approved, users will be able to install the Chinese Li (clerical) Font provided by the Ministry of Education, Republic of China (Taiwan). This is probably the first font of clerical script in nixpkgs. --- pkgs/data/fonts/eduli/default.nix | 36 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/fonts/eduli/default.nix diff --git a/pkgs/data/fonts/eduli/default.nix b/pkgs/data/fonts/eduli/default.nix new file mode 100644 index 00000000000..7ff2ad4446c --- /dev/null +++ b/pkgs/data/fonts/eduli/default.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "eduli"; + version = "3.0"; + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; + sha256 = "0vpmm2qb429npng0aqkafwgs7cjibq8a3f7bbn9hysbm2lndwxwd"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + for name in *.ttf; do + mv "$name" "$out/share/fonts/$(echo $name | sed -r 's/(.*)\(.*\)\.ttf/\1.ttf/')" + done + ''; + + meta = { + description = + "The MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Li Font is a li (clerical srcipt) font + provided by + the Midistry of Education, Republic of China (Taiwan). + It currently includes 4,808 Chinese characters. + The clerical script (lishu) is an archaic style of Chinese calligraphy. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=49"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cc62762eb1..4536120b4c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18298,6 +18298,10 @@ in edukai = callPackage ../data/fonts/edukai { }; + eduli = callPackage ../data/fonts/eduli { }; + + moeli = eduli; + edusong = callPackage ../data/fonts/edusong { }; elliptic_curves = callPackage ../data/misc/elliptic_curves { };