From b66c90b658ad6276bea3e5f54b65fa5e590d7c93 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 9 Nov 2025 12:38:50 +0900 Subject: [PATCH] plemoljp, plemoljp-{nf,hs}: refine updateScript * Share `version` and `meta` in font variants While fonts have fewer restrictions than executables, the motivation is essentially the same as 900ebdb9e482bdfc63f8231d93a058d4836e7ae9. There is no reason to update these packages individually. * Add `updateScript` Upstream used `-beta*` tags for the 2.0.0 release. The script now only targets tags for stable versions. * Prefer `finalAttrs` over `rec`' I included this modernization in the same commit because it relates to the version reference. --- pkgs/by-name/pl/plemoljp-hs/package.nix | 19 +++++++++---------- pkgs/by-name/pl/plemoljp-nf/package.nix | 19 +++++++++---------- pkgs/by-name/pl/plemoljp/package.nix | 13 ++++++++++--- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index edd261d80865..d7be0af69b5b 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -1,15 +1,18 @@ { - lib, stdenvNoCC, fetchzip, + plemoljp, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp-hs"; - version = "3.0.0"; + + # plemoljp's updateScript also updates this version. + # nixpkgs-update: no auto update + inherit (plemoljp) version; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_HS_v${finalAttrs.version}.zip"; hash = "sha256-V21T8ktNZE4nq3SH6aN9iIJHmGTkZuMsvT84yHbwSqI="; }; @@ -24,11 +27,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = { + meta = plemoljp.meta // { description = "Composite font of IBM Plex Mono, IBM Plex Sans JP and hidden full-width space"; - homepage = "https://github.com/yuru7/PlemolJP"; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ kachick ]; }; -} +}) diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix index b54b18dada26..c37d584f9292 100644 --- a/pkgs/by-name/pl/plemoljp-nf/package.nix +++ b/pkgs/by-name/pl/plemoljp-nf/package.nix @@ -1,15 +1,18 @@ { - lib, stdenvNoCC, fetchzip, + plemoljp, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp-nf"; - version = "3.0.0"; + + # plemoljp's updateScript also updates this version. + # nixpkgs-update: no auto update + inherit (plemoljp) version; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_NF_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_NF_v${finalAttrs.version}.zip"; hash = "sha256-m8zR9ySl88DnVzG4fKJtc9WjSLDMLU4YDX+KXhcP2WU="; }; @@ -22,11 +25,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = { + meta = plemoljp.meta // { description = "Composite font of IBM Plex Mono, IBM Plex Sans JP and nerd-fonts"; - homepage = "https://github.com/yuru7/PlemolJP"; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ kachick ]; }; -} +}) diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index 4aee3298f8b8..3899f7448193 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -2,14 +2,15 @@ lib, stdenvNoCC, fetchzip, + nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp"; version = "3.0.0"; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_v${finalAttrs.version}.zip"; hash = "sha256-R4zC1pnM72FVqBQ5d03z8vyVccsM163BE15m2hdEnSA="; }; @@ -24,6 +25,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + }; + }; + meta = { description = "Composite font of IBM Plex Mono and IBM Plex Sans JP"; homepage = "https://github.com/yuru7/PlemolJP"; @@ -31,4 +38,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ kachick ]; }; -} +})