From c98078e813739fcef438a2299564becc72585fd8 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 3 Feb 2025 16:01:16 +0800 Subject: [PATCH 1/6] vista-fonts: rename from vistafonts --- pkgs/by-name/vi/{vistafonts => vista-fonts}/no-op.conf | 0 pkgs/by-name/vi/{vistafonts => vista-fonts}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+) rename pkgs/by-name/vi/{vistafonts => vista-fonts}/no-op.conf (100%) rename pkgs/by-name/vi/{vistafonts => vista-fonts}/package.nix (100%) diff --git a/pkgs/by-name/vi/vistafonts/no-op.conf b/pkgs/by-name/vi/vista-fonts/no-op.conf similarity index 100% rename from pkgs/by-name/vi/vistafonts/no-op.conf rename to pkgs/by-name/vi/vista-fonts/no-op.conf diff --git a/pkgs/by-name/vi/vistafonts/package.nix b/pkgs/by-name/vi/vista-fonts/package.nix similarity index 100% rename from pkgs/by-name/vi/vistafonts/package.nix rename to pkgs/by-name/vi/vista-fonts/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 403a59eaad18..473f8667de85 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1482,6 +1482,7 @@ mapAliases { viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 + vistafonts = vista-fonts; # Added 2025-02-03 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 From 7e3f245b3c8a8c67361d293e8ab88489f5c56ed4 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 3 Feb 2025 16:02:16 +0800 Subject: [PATCH 2/6] vista-fonts-chs: rename from vistafonts-chs --- pkgs/by-name/vi/{vistafonts-chs => vista-fonts-chs}/no-op.conf | 0 pkgs/by-name/vi/{vistafonts-chs => vista-fonts-chs}/package.nix | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pkgs/by-name/vi/{vistafonts-chs => vista-fonts-chs}/no-op.conf (100%) rename pkgs/by-name/vi/{vistafonts-chs => vista-fonts-chs}/package.nix (100%) diff --git a/pkgs/by-name/vi/vistafonts-chs/no-op.conf b/pkgs/by-name/vi/vista-fonts-chs/no-op.conf similarity index 100% rename from pkgs/by-name/vi/vistafonts-chs/no-op.conf rename to pkgs/by-name/vi/vista-fonts-chs/no-op.conf diff --git a/pkgs/by-name/vi/vistafonts-chs/package.nix b/pkgs/by-name/vi/vista-fonts-chs/package.nix similarity index 100% rename from pkgs/by-name/vi/vistafonts-chs/package.nix rename to pkgs/by-name/vi/vista-fonts-chs/package.nix From e9bea73c410bddc3aba0685b3ca7b2df17a77481 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 3 Feb 2025 16:03:03 +0800 Subject: [PATCH 3/6] vista-fonts-cht: rename from vistafonts-cht --- pkgs/by-name/vi/{vistafonts-cht => vista-fonts-cht}/no-op.conf | 0 pkgs/by-name/vi/{vistafonts-cht => vista-fonts-cht}/package.nix | 0 pkgs/top-level/aliases.nix | 2 ++ 3 files changed, 2 insertions(+) rename pkgs/by-name/vi/{vistafonts-cht => vista-fonts-cht}/no-op.conf (100%) rename pkgs/by-name/vi/{vistafonts-cht => vista-fonts-cht}/package.nix (100%) diff --git a/pkgs/by-name/vi/vistafonts-cht/no-op.conf b/pkgs/by-name/vi/vista-fonts-cht/no-op.conf similarity index 100% rename from pkgs/by-name/vi/vistafonts-cht/no-op.conf rename to pkgs/by-name/vi/vista-fonts-cht/no-op.conf diff --git a/pkgs/by-name/vi/vistafonts-cht/package.nix b/pkgs/by-name/vi/vista-fonts-cht/package.nix similarity index 100% rename from pkgs/by-name/vi/vistafonts-cht/package.nix rename to pkgs/by-name/vi/vista-fonts-cht/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 473f8667de85..513169651b17 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1483,6 +1483,8 @@ mapAliases { viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 vistafonts = vista-fonts; # Added 2025-02-03 + vistafonts-chs = vista-fonts-chs; # Added 2025-02-03 + vistafonts-cht = vista-fonts-cht; # Added 2025-02-03 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 From b07df3f3ae0f90ab8c9616bc0ee188cac4c8314e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 5 Feb 2025 21:00:40 +0800 Subject: [PATCH 4/6] vista-fonts: add missing hooks --- pkgs/by-name/vi/vista-fonts/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/vista-fonts/package.nix b/pkgs/by-name/vi/vista-fonts/package.nix index d6f88cc17710..44d2551ce72b 100644 --- a/pkgs/by-name/vi/vista-fonts/package.nix +++ b/pkgs/by-name/vi/vista-fonts/package.nix @@ -11,18 +11,24 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "mirror://sourceforge/mscorefonts2/cabs/PowerPointViewer.exe"; - sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4"; + hash = "sha256-xOdTVI0wkv/X3ThJEF4KJtm1oa/kbm5mf+fGiHiTcB8="; }; nativeBuildInputs = [ cabextract ]; unpackPhase = '' + runHook preUnpack + cabextract --lowercase --filter ppviewer.cab $src cabextract --lowercase --filter '*.TTF' ppviewer.cab cabextract --lowercase --filter '*.TTC' ppviewer.cab + + runHook postUnpack ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf *.ttc $out/share/fonts/truetype @@ -33,6 +39,8 @@ stdenvNoCC.mkDerivation { substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-''${name,,}.conf \ --subst-var-by fontname $name done + + runHook postInstall ''; meta = { From 1a01ddec3a4006ce58537011e82a328514c3aee0 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 5 Feb 2025 21:19:10 +0800 Subject: [PATCH 5/6] vista-fonts-chs: add missing hooks --- pkgs/by-name/vi/vista-fonts-chs/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/vista-fonts-chs/package.nix b/pkgs/by-name/vi/vista-fonts-chs/package.nix index 70491300ea74..bbac976571e5 100644 --- a/pkgs/by-name/vi/vista-fonts-chs/package.nix +++ b/pkgs/by-name/vi/vista-fonts-chs/package.nix @@ -13,16 +13,22 @@ stdenvNoCC.mkDerivation { url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; # Alternative mirror: # http://www.eeo.cn/download/font/VistaFont_CHS.EXE - sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi"; + hash = "sha256-saMIBEDTt9Ijv8g1nQHRNTG1ykIbHrCxjzdhhRYYleM="; }; nativeBuildInputs = [ cabextract ]; unpackPhase = '' + runHook preUnpack + cabextract --lowercase --filter '*.TTF' $src + + runHook postUnpack ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -31,6 +37,8 @@ stdenvNoCC.mkDerivation { mkdir -p $out/etc/fonts/conf.d substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-msyahei.conf \ --subst-var-by fontname "Microsoft YaHei" + + runHook postInstall ''; meta = { From 674b249a6798564dcfae7fe1ad8aecc6f5db45eb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 5 Feb 2025 21:19:51 +0800 Subject: [PATCH 6/6] vista-fonts-cht: add missing hooks --- pkgs/by-name/vi/vista-fonts-cht/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/vi/vista-fonts-cht/package.nix b/pkgs/by-name/vi/vista-fonts-cht/package.nix index 593df81676f2..eeffdccd0455 100644 --- a/pkgs/by-name/vi/vista-fonts-cht/package.nix +++ b/pkgs/by-name/vi/vista-fonts-cht/package.nix @@ -11,16 +11,22 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE"; - sha256 = "sha256-fSnbbxlMPzbhFSQyKxQaS5paiWji8njK7tS8Eppsj6g="; + hash = "sha256-fSnbbxlMPzbhFSQyKxQaS5paiWji8njK7tS8Eppsj6g="; }; nativeBuildInputs = [ cabextract ]; unpackPhase = '' + runHook preUnpack + cabextract --lowercase --filter '*.TTF' $src + + runHook postUnpack ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -29,17 +35,19 @@ stdenvNoCC.mkDerivation { mkdir -p $out/etc/fonts/conf.d substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-msjhenghei.conf \ --subst-var-by fontname "Microsoft JhengHei" + + runHook postInstall ''; - meta = with lib; { + meta = { description = "TrueType fonts from Microsoft Windows Vista For Traditional Chinese (Microsoft JhengHei)"; homepage = "https://www.microsoft.com/typography/fonts/family.aspx"; - license = licenses.unfree; - maintainers = with maintainers; [ atkinschang ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ atkinschang ]; # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. priority = 5; - platforms = platforms.all; + platforms = lib.platforms.all; }; }