diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7b645f72ba32..cd8b9ec17930 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -29373,6 +29373,12 @@ githubId = 78392041; name = "Winter"; }; + winterec = { + github = "winterec"; + githubId = 9159652; + name = "Edward"; + keys = [ { fingerprint = "0BC2F3C6AE5D73DAE870CB0E8AE4DE0EFB6CC443"; } ]; + }; wirew0rm = { email = "alex@wirew0rm.de"; github = "wirew0rm"; diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix index a9a3c9ec9374..87f7cdbd615b 100644 --- a/pkgs/by-name/ed/edukai/package.nix +++ b/pkgs/by-name/ed/edukai/package.nix @@ -2,32 +2,32 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "edukai"; - version = "5.0"; + version = "5.1"; src = fetchzip { - url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${version}.zip"; - sha256 = "sha256-3+w9n6GJQg9+HfHYukC7tlm4GVs8vEOO23hrLw6qjTY="; + url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${finalAttrs.version}.zip"; + hash = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc="; }; - installPhase = '' - mkdir -p $out/share/fonts/ - mv *.ttf $out/share/fonts/ - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "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. + The MOE Standard Kai Font is a kai (regular script) font + provided by the Ministry of Education, Republic of China (Taiwan). + It currently includes 13,084 Chinese characters. ''; - homepage = "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=47"; + homepage = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai.pdf"; license = lib.licenses.cc-by-nd-30; - maintainers = with lib.maintainers; [ ShamrockLee ]; + maintainers = with lib.maintainers; [ + ShamrockLee + winterec + ]; }; -} +}) diff --git a/pkgs/by-name/ed/eduli/package.nix b/pkgs/by-name/ed/eduli/package.nix index f4f547f43ba2..d813b0c96a61 100644 --- a/pkgs/by-name/ed/eduli/package.nix +++ b/pkgs/by-name/ed/eduli/package.nix @@ -2,35 +2,33 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "eduli"; version = "3.0"; src = fetchzip { - url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; + url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-${finalAttrs.version}.zip"; hash = "sha256-bDQtLugYPWwJJNusBLEJrgIVufocRK4NIR0CCGaTkyw="; }; - 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 - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "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). + The MOE Li Font is a li (clerical script) font provided by + the Ministry 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"; + homepage = "https://language.moe.gov.tw/material/info?m=9fe3fb11-c3d5-41f2-b029-6d18a2c2fd0d"; license = lib.licenses.cc-by-nd-30; - maintainers = with lib.maintainers; [ ShamrockLee ]; + maintainers = with lib.maintainers; [ + ShamrockLee + winterec + ]; }; -} +}) diff --git a/pkgs/by-name/ed/edusong/package.nix b/pkgs/by-name/ed/edusong/package.nix index 96a436d44061..74096de36cae 100644 --- a/pkgs/by-name/ed/edusong/package.nix +++ b/pkgs/by-name/ed/edusong/package.nix @@ -2,30 +2,31 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "edusong"; - version = "4.0"; + version = "4.4"; src = fetchzip { name = "edusong-${finalAttrs.version}"; url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip"; - hash = "sha256-4NBnwMrYufeZbgSiD2fAhe4tuy0aAA5u9tWwjQQjEQk="; + hash = "sha256-+wH6I0sOfzytstDNT81LMuqknGQuYekl31e1tYaDvRg="; }; - installPhase = '' - mkdir -p $out/share/fonts/ - mv eduSong_Unicode*.ttf $out/share/fonts/eduSong_Unicode\(2024年12月\).ttf - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "MOE Song font, a Song-style Chinese character typeface"; longDescription = '' A Song-style Chinese character typeface published by the Ministry of Education of the Republic of China (Taiwan). The Song style is also referred to as 宋體, 宋体, sòngtǐ, 明體, 明体, or míngtǐ, in Chinese; 명조체, 明朝體, or myeongjo in Korean; 明朝体, みんちょうたい, or minchōtai in Japanese. ''; - homepage = "https://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=48"; + homepage = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edusun.pdf"; license = lib.licenses.cc-by-nd-30; - maintainers = with lib.maintainers; [ ShamrockLee ]; + maintainers = with lib.maintainers; [ + ShamrockLee + winterec + ]; }; })