From 9b4c9079b57c9979fa14c1b818f3dc39a91edf3d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 13 Mar 2024 14:38:59 +0100
Subject: [PATCH] sarasa-gothic: 1.0.5 -> 1.0.6, refactor

---
 .../sa/sarasa-gothic/package.nix}             | 30 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 19 insertions(+), 13 deletions(-)
 rename pkgs/{data/fonts/sarasa-gothic/default.nix => by-name/sa/sarasa-gothic/package.nix} (57%)

diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
similarity index 57%
rename from pkgs/data/fonts/sarasa-gothic/default.nix
rename to pkgs/by-name/sa/sarasa-gothic/package.nix
index 35f098442c22..3d91b7ee0f47 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -1,19 +1,24 @@
-{ lib, stdenvNoCC, fetchurl, p7zip }:
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  unzip,
+}:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
-    url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/Sarasa-TTC-${version}.7z";
-    hash = "sha256-OPoX6GNCilA8Lj9kLO6RHapU7mpZTiNa/8LL72TG1Wk=";
+    url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}b/Sarasa-TTC-${finalAttrs.version}.zip";
+    hash = "sha256-MkbmEn4vV2WEDC8pW+WewPuVhlLPi2iGmhvJW6Szksw=";
   };
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ p7zip ];
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
     runHook preInstall
@@ -24,11 +29,14 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "A CJK programming font based on Iosevka and Source Han Sans";
     homepage = "https://github.com/be5invis/Sarasa-Gothic";
-    license = licenses.ofl;
-    maintainers = [ maintainers.ChengCat ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [
+      ChengCat
+      wegank
+    ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab3de3d72503..8e899841fbd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29536,8 +29536,6 @@ with pkgs;
 
   sarabun-font = callPackage ../data/fonts/sarabun { };
 
-  sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { };
-
   savepagenow = callPackage ../tools/misc/savepagenow { };
 
   scheme-manpages = callPackage ../data/documentation/scheme-manpages { };