From 8f7f5fe021883b6a7f8f65555c22cac10cd7d610 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:04:03 +0800
Subject: [PATCH 1/7] maintainers: add winterec

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cdcb7f59fffc..a946fd59a3aa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29208,6 +29208,12 @@
     githubId = 78392041;
     name = "Winter";
   };
+  winterec = {
+    github = "winterec";
+    githubId = 9159652;
+    name = "Edward";
+    keys = [ { fingerprint = "0BC2F3C6AE5D73DAE870CB0E8AE4DE0EFB6CC443"; } ];
+  };
   wirew0rm = {
     email = "alex@wirew0rm.de";
     github = "wirew0rm";

From b6f4e83f66475559699b3a996ba2dc5e5e0e0135 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:13:34 +0800
Subject: [PATCH 2/7] edukai: 5.0 -> 5.1

---
 pkgs/by-name/ed/edukai/package.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix
index a9a3c9ec9374..4a697e5b1ad5 100644
--- a/pkgs/by-name/ed/edukai/package.nix
+++ b/pkgs/by-name/ed/edukai/package.nix
@@ -4,13 +4,13 @@
   fetchzip,
 }:
 
-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";
+    sha256 = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc=";
   };
 
   installPhase = ''
@@ -21,13 +21,15 @@ stdenvNoCC.mkDerivation rec {
   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
+    ];
   };
-}
+})

From 9da7ef54e488dbccf985e27db30b8c44d63474f6 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:41:50 +0800
Subject: [PATCH 3/7] edukai: use installFonts hook

---
 pkgs/by-name/ed/edukai/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix
index 4a697e5b1ad5..371f3f4d4970 100644
--- a/pkgs/by-name/ed/edukai/package.nix
+++ b/pkgs/by-name/ed/edukai/package.nix
@@ -2,6 +2,7 @@
   stdenvNoCC,
   lib,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -13,10 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sha256 = "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)";

From af2d14c5be67bfcf5d4a582e9e086e40dc884e42 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:37:29 +0800
Subject: [PATCH 4/7] edusong: 4.0 -> 4.4

---
 pkgs/by-name/ed/edusong/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ed/edusong/package.nix b/pkgs/by-name/ed/edusong/package.nix
index 96a436d44061..7d88cdf4d334 100644
--- a/pkgs/by-name/ed/edusong/package.nix
+++ b/pkgs/by-name/ed/edusong/package.nix
@@ -6,12 +6,12 @@
 
 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 = ''
@@ -24,8 +24,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     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
+    ];
   };
 })

From 8d03b42f15dbe42aadafa27d117307c087758092 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:37:57 +0800
Subject: [PATCH 5/7] edusong: use installFonts hook

---
 pkgs/by-name/ed/edusong/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ed/edusong/package.nix b/pkgs/by-name/ed/edusong/package.nix
index 7d88cdf4d334..74096de36cae 100644
--- a/pkgs/by-name/ed/edusong/package.nix
+++ b/pkgs/by-name/ed/edusong/package.nix
@@ -2,6 +2,7 @@
   stdenvNoCC,
   lib,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -14,10 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     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";

From c59b0caf17238a8c9f0d3d059ec927da9d4c8463 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:48:03 +0800
Subject: [PATCH 6/7] eduli: use installFonts hook

---
 pkgs/by-name/ed/eduli/package.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

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
+    ];
   };
-}
+})

From cda37cbc201887589d1c639189b5752ab428d19e Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Mon, 20 Apr 2026 20:00:52 +0800
Subject: [PATCH 7/7] edukai: use hash rather than sha256

Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
---
 pkgs/by-name/ed/edukai/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix
index 371f3f4d4970..87f7cdbd615b 100644
--- a/pkgs/by-name/ed/edukai/package.nix
+++ b/pkgs/by-name/ed/edukai/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchzip {
     url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${finalAttrs.version}.zip";
-    sha256 = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc=";
+    hash = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc=";
   };
 
   nativeBuildInputs = [ installFonts ];