From e10036994b83d17052660fe79921973b6e5a8946 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 4 Nov 2025 15:48:05 -0800
Subject: [PATCH 1/6] komika-fonts: correct meta/version, remove incorrect
 fonts

---
 pkgs/by-name/ko/komika-fonts/package.nix | 33 +++---------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/ko/komika-fonts/package.nix b/pkgs/by-name/ko/komika-fonts/package.nix
index c6473d2c8445..76b47f9d258b 100644
--- a/pkgs/by-name/ko/komika-fonts/package.nix
+++ b/pkgs/by-name/ko/komika-fonts/package.nix
@@ -8,11 +8,6 @@
     "poster"
     "text"
     "title"
-    "komikahuna"
-    "komikandy"
-    "komikazba"
-    "komikaze"
-    "komikazoom"
   ],
 }:
 
@@ -57,26 +52,6 @@ let
         "Referer: https://www.1001freefonts.com/komika-title.font"
       ];
     };
-    "komikahuna" = {
-      url = "https://www.1001fonts.com/download/komikahuna.zip";
-      hash = "sha256-TjGxQA3ZyIOyJUNP+MVkYiSDk9WDIDPy3d2ttWC1aoc=";
-    };
-    "komikandy" = {
-      url = "https://www.1001fonts.com/download/komikandy.zip";
-      hash = "sha256-NqpR+gM2giTHGUBYoJlO8vkzOD0ep7LzAry3nIagjLY=";
-    };
-    "komikazba" = {
-      url = "https://www.1001fonts.com/download/komikazba.zip";
-      hash = "sha256-SGJMP0OdZ/AEImN5S3QshCbWSLXO4qTjHnSQYqoy3Pc=";
-    };
-    "komikaze" = {
-      url = "https://www.1001fonts.com/download/komikaze.zip";
-      hash = "sha256-daJRwgkzL5v224KwkaGMK2FqVnfin8+8WvMTvXTkCGE=";
-    };
-    "komikazoom" = {
-      url = "https://www.1001fonts.com/download/komikazoom.zip";
-      hash = "sha256-/o2QPPPiQBkNU0XRxJyI0+5CKFEv4FKU3A5ku1zyVX4=";
-    };
 
   };
   knownFonts = lib.attrNames fontMap;
@@ -95,20 +70,18 @@ let
 in
 stdenvNoCC.mkDerivation {
   pname = "komika-fonts";
-  version = "0-unstable-2024-08-12";
+  version = "0-unstable-2001-06-16";
   sourceRoot = ".";
 
   srcs = map (variant: fetchFont fontMap.${variant}) selectedFonts;
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/share/fonts/ttf
-    mv **/*.ttf $out/share/fonts/ttf
+    install -Dm444 **/*.ttf -t $out/share/fonts/ttf
     runHook postInstall
   '';
 
   meta = {
-    homepage = "https://moorstation.org/typoasis/designers/lab/index.htm";
-    # description from archive here: http://web.archive.org/web/20030422173903fw_/http://www.hardcovermedia.com/lab/Pages/Fontpages/komikahands.html
+    homepage = "https://pedroreina.net/apostrophiclab/";
     description = "First ever comic lettering super family";
     longDescription = ''
       50 fonts, covering everything the comic artist needs when it comes to lettering. 10 text faces, 10 display faces, 10 tiling faces, 10 hand variations, 9 poster faces, and 20 balloons in a font.

From dfd717fa20bd59dbb74d6602a04043497a0cc6f8 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:08:40 -0800
Subject: [PATCH 2/6] komikahuna: init at 0-unstable-2000-10-14

---
 pkgs/by-name/ko/komikahuna/package.nix | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/ko/komikahuna/package.nix

diff --git a/pkgs/by-name/ko/komikahuna/package.nix b/pkgs/by-name/ko/komikahuna/package.nix
new file mode 100644
index 000000000000..be5a71eba227
--- /dev/null
+++ b/pkgs/by-name/ko/komikahuna/package.nix
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikahuna";
+  version = "0-unstable-2000-10-14";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikahuna.zip";
+    hash = "sha256-TjGxQA3ZyIOyJUNP+MVkYiSDk9WDIDPy3d2ttWC1aoc=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0049-Komikahuna/komikahuna.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}

From 46f170a203db3f9dcf7ffec6bbb117e146a6dc69 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:13:13 -0800
Subject: [PATCH 3/6] komikandy: init at 0-unstable-2001-05-12

---
 pkgs/by-name/ko/komikandy/package.nix | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/ko/komikandy/package.nix

diff --git a/pkgs/by-name/ko/komikandy/package.nix b/pkgs/by-name/ko/komikandy/package.nix
new file mode 100644
index 000000000000..fa3ee8d69c34
--- /dev/null
+++ b/pkgs/by-name/ko/komikandy/package.nix
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikandy";
+  version = "0-unstable-2001-05-12";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikandy.zip";
+    hash = "sha256-NqpR+gM2giTHGUBYoJlO8vkzOD0ep7LzAry3nIagjLY=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0122-Komikandy/komikandy.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}

From 6d920082128e067761eaa2f1a9994db261eaae66 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:17:01 -0800
Subject: [PATCH 4/6] komikazba: init at 0-unstable-2000-10-30

---
 pkgs/by-name/ko/komikazba/package.nix | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/ko/komikazba/package.nix

diff --git a/pkgs/by-name/ko/komikazba/package.nix b/pkgs/by-name/ko/komikazba/package.nix
new file mode 100644
index 000000000000..159ef68da2cc
--- /dev/null
+++ b/pkgs/by-name/ko/komikazba/package.nix
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikazba";
+  version = "0-unstable-2000-10-30";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikazba.zip";
+    hash = "sha256-SGJMP0OdZ/AEImN5S3QshCbWSLXO4qTjHnSQYqoy3Pc=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0052-Komikazba/komikazba.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}

From 868d79e1cc2dc4d2d7f34bd87906746b80b16111 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:20:45 -0800
Subject: [PATCH 5/6] komikaze: init at 0-unstable-2000-09-23

---
 pkgs/by-name/ko/komikaze/package.nix | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/ko/komikaze/package.nix

diff --git a/pkgs/by-name/ko/komikaze/package.nix b/pkgs/by-name/ko/komikaze/package.nix
new file mode 100644
index 000000000000..a203174dc643
--- /dev/null
+++ b/pkgs/by-name/ko/komikaze/package.nix
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikaze";
+  version = "0-unstable-2000-09-23";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikaze.zip";
+    hash = "sha256-daJRwgkzL5v224KwkaGMK2FqVnfin8+8WvMTvXTkCGE=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0045-Komikaze/komikaze.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}

From f28029940a86127f65002547b7433adb14ef90dc Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:23:35 -0800
Subject: [PATCH 6/6] komikazoom: init at 0-unstable-2000-09-29

---
 pkgs/by-name/ko/komikazoom/package.nix | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/ko/komikazoom/package.nix

diff --git a/pkgs/by-name/ko/komikazoom/package.nix b/pkgs/by-name/ko/komikazoom/package.nix
new file mode 100644
index 000000000000..5bc73917c794
--- /dev/null
+++ b/pkgs/by-name/ko/komikazoom/package.nix
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikazoom";
+  version = "0-unstable-2000-09-29";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikazoom.zip";
+    hash = "sha256-/o2QPPPiQBkNU0XRxJyI0+5CKFEv4FKU3A5ku1zyVX4=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0046-Komikazoom/komikazoom.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}