From 70b30c5ae8ea09d2cded4d4341b3772f061c642f Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Mon, 5 May 2025 13:50:45 +0200
Subject: [PATCH] ark-pixel-font: 2024.05.12 -> 2025.03.14

---
 .../ar/ark-pixel-font/limit-builds.patch      | 34 ------------------
 pkgs/by-name/ar/ark-pixel-font/package.nix    | 35 ++++++-------------
 2 files changed, 10 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/by-name/ar/ark-pixel-font/limit-builds.patch

diff --git a/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch b/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch
deleted file mode 100644
index c63798e071c9..000000000000
--- a/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/build.py b/build.py
-index 48bc757d..88b9ed9b 100644
---- a/build.py
-+++ b/build.py
-@@ -1,6 +1,5 @@
- from scripts import configs
- from scripts.configs import path_define
--from scripts.services import publish_service, info_service, template_service, image_service
- from scripts.services.font_service import DesignContext, FontContext
- from scripts.utils import fs_util
- 
-@@ -21,21 +20,6 @@ def main():
-             font_context.make_pcf()
-             font_context.make_otc()
-             font_context.make_ttc()
--            publish_service.make_release_zips(font_config, width_mode)
--            info_service.make_info_file(design_context, width_mode)
--            info_service.make_alphabet_txt_file(design_context, width_mode)
--            template_service.make_alphabet_html_file(design_context, width_mode)
--        template_service.make_demo_html_file(design_context)
--        image_service.make_preview_image_file(font_config)
--    template_service.make_index_html_file()
--    template_service.make_playground_html_file()
--    image_service.make_readme_banner()
--    image_service.make_github_banner()
--    image_service.make_itch_io_banner()
--    image_service.make_itch_io_background()
--    image_service.make_itch_io_cover()
--    image_service.make_afdian_cover()
--
- 
- if __name__ == '__main__':
-     main()
-
diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix
index 7d0313f9f23e..21e84141216b 100644
--- a/pkgs/by-name/ar/ark-pixel-font/package.nix
+++ b/pkgs/by-name/ar/ark-pixel-font/package.nix
@@ -3,52 +3,37 @@
   python312Packages,
   fetchFromGitHub,
   nix-update-script,
-  fetchPypi,
 }:
 
-let
-  pixel-font-builder-compat = python312Packages.pixel-font-builder.overrideAttrs rec {
-    version = "0.0.26";
-    src = fetchPypi {
-      inherit version;
-      pname = "pixel_font_builder";
-      hash = "sha256-bgs2FbOA5tcUXe5+KuVztWGAv5yFxQNBaiZMeZ+ic+8=";
-    };
-  };
-in
 python312Packages.buildPythonPackage rec {
   pname = "ark-pixel-font";
-  version = "2024.05.12";
+  version = "2025.03.14";
+  pyproject = false;
 
   src = fetchFromGitHub {
     owner = "TakWolf";
     repo = "ark-pixel-font";
     tag = version;
-    hash = "sha256-PGhhKWHDpvOqa3vaI40wuIsAEdWGb62cN7QJeHQqiss=";
+    hash = "sha256-B/XsZEpSxY4k8uj3Vy31c9+GcO7d3NFcADLtPU6p/CI=";
   };
 
-  format = "other";
-
-  nativeBuildInputs = with python312Packages; [
-    pixel-font-builder-compat
+  dependencies = with python312Packages; [
+    pixel-font-builder
+    pixel-font-knife
     unidata-blocks
     character-encoding-utils
-    pypng
+    pyyaml
     pillow
     beautifulsoup4
     jinja2
-    gitpython
+    loguru
+    cyclopts
   ];
 
-  # By default build.py builds a LOT of extraneous artifacts we don't need.
-  patches = [ ./limit-builds.patch ];
-
   buildPhase = ''
     runHook preBuild
 
-    # Too much debug output would break Hydra, so this jankness has to be here for it to build at all.
-    # I wish there's a builtin way to set the log level without modifying the script itself...
-    python3 build.py 2>&1 >/dev/null | grep -E '^(INFO|WARN|ERROR)'
+    python -m tools.cli --cleanup
 
     runHook postBuild
   '';