From ec7c9c3d97430bac735f1916e2518d8ed458fd49 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:46:35 +0800 Subject: [PATCH 1/3] lxgw-wenkai: move to `pkgs/by-name` --- .../default.nix => by-name/lx/lxgw-wenkai/package.nix} | 6 +++++- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/{data/fonts/lxgw-wenkai/default.nix => by-name/lx/lxgw-wenkai/package.nix} (94%) diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix similarity index 94% rename from pkgs/data/fonts/lxgw-wenkai/default.nix rename to pkgs/by-name/lx/lxgw-wenkai/package.nix index 8c18f3ed1bba..6cb83fa452b3 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -1,4 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c77d940eb55a..1de3d62b1cee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27493,8 +27493,6 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - lxgw-wenkai = callPackage ../data/fonts/lxgw-wenkai { }; - maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; From 218d3ca65ae461bde64ad7dd526afe533fba3cd4 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:48:08 +0800 Subject: [PATCH 2/3] lxgw-wenkai: 1.330 -> 1.500 --- pkgs/by-name/lx/lxgw-wenkai/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxgw-wenkai/package.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix index 6cb83fa452b3..d4edd1ca7eae 100644 --- a/pkgs/by-name/lx/lxgw-wenkai/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.330"; + version = "1.500"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-CscUUcyLsk/S70tT2uGRqLiF8fa4KxC9pVrOziWJ/fI="; + hash = "sha256-5cQSHrL/kllmsrOSEHDhsiIa3PXpDh5ELrCnVh/9pxI="; }; installPhase = '' From 123ffa00c9333c07b21fbc2358bdf2f0c8292d57 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:43:54 +0800 Subject: [PATCH 3/3] lxgw-wenkai: add ryanccn as maintainer --- pkgs/by-name/lx/lxgw-wenkai/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lx/lxgw-wenkai/package.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix index d4edd1ca7eae..38fea5286a1d 100644 --- a/pkgs/by-name/lx/lxgw-wenkai/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec { description = "Open-source Chinese font derived from Fontworks' Klee One"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ elliot ]; + maintainers = with maintainers; [ ryanccn ]; }; }