archives/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-03-08 03:24:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sourceHanPackages: move packages to toplevel only (#437190)

Browse source
This commit is contained in:
Wolfgang Walther 2026-01-21 18:54:25 +00:00 • committed by GitHub
commit af34bc65da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkgs/data/fonts/source-han/default.nix
View file

@ -86,7 +86,7 @@ let
};
in
{
sans = makeSuperOTC {
source-han-sans = makeSuperOTC {
family = "sans";
description = "sans-serif";
rev = "2.005R";
@ -95,7 +95,7 @@ in
prefix = "01_";
};
serif = makeSuperOTC {
source-han-serif = makeSuperOTC {
family = "serif";
description = "serif";
rev = "2.003R";
@ -104,35 +104,35 @@ in
prefix = "01_";
};
mono = makeSuperOTC {
source-han-mono = makeSuperOTC {
family = "mono";
description = "monospaced";
rev = "1.002";
hash = "sha256-DBkkSN6QhI8R64M2h2iDqaNtxluJZeSJYAz8x6ZzWME=";
};
sans-vf-otf = makeVariable {
source-han-sans-vf-otf = makeVariable {
family = "sans";
version = "2.005";
hash = "sha256-7/THncqTE6IpPezcX14eYRRC8WR/xPv0XjfOPEfF8aU=";
format = "otf";
};
sans-vf-ttf = makeVariable {
source-han-sans-vf-ttf = makeVariable {
family = "sans";
version = "2.005";
hash = "sha256-CL5kjZzCiNvdcwiFflTlarINpeYxvuqZH+4ayiIQdD8=";
format = "ttf";
};
serif-vf-otf = makeVariable {
source-han-serif-vf-otf = makeVariable {
family = "serif";
version = "2.003";
hash = "sha256-a6295Ukha9QY5ByMr2FUy13j5gZ1itnezvfJWmJjqt0=";
format = "otf";
};
serif-vf-ttf = makeVariable {
source-han-serif-vf-ttf = makeVariable {
family = "serif";
version = "2.003";
hash = "sha256-F+FUQunfyAEBVV10lZxC3dzGTWhHgHzpTO8CjC3n4WY=";

7
pkgs/top-level/aliases.nix
View file

@ -1578,6 +1578,13 @@ mapAliases {
source-han-serif-korean = throw "'source-han-serif-korean' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
source-han-serif-simplified-chinese = throw "'source-han-serif-simplified-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
source-han-serif-traditional-chinese = throw "'source-han-serif-traditional-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
sourceHanPackages.mono = warnAlias "'sourceHanPackages.mono' has been renamed to ''source-han-mono" source-han-mono; # Added 2025-11-03
sourceHanPackages.sans = warnAlias "'sourceHanPackages.sans' has been renamed to ''source-han-sans" source-han-sans; # Added 2025-11-03
sourceHanPackages.sans-vf-otf = warnAlias "'sourceHanPackages.sans-vf-otf' has been renamed to ''source-han-sans-vf-otf" source-han-sans-vf-otf; # Added 2025-11-03
sourceHanPackages.sans-vf-ttf = warnAlias "'sourceHanPackages.sans-vf-ttf' has been renamed to ''source-han-sans-vf-ttf" source-han-sans-vf-ttf; # Added 2025-11-03
sourceHanPackages.serif = warnAlias "'sourceHanPackages.serif' has been renamed to ''source-han-serif" source-han-serif; # Added 2025-11-03
sourceHanPackages.serif-vf-otf = warnAlias "'sourceHanPackages.serif-vf-otf' has been renamed to ''source-han-serif-vf-otf" source-han-serif-vf-otf; # Added 2025-11-03
sourceHanPackages.serif-vf-ttf = warnAlias "'sourceHanPackages.serif-vf-ttf' has been renamed to ''source-han-serif-vf-ttf" source-han-serif-vf-ttf; # Added 2025-11-03
sourceHanSansPackages.japanese = throw "'sourceHanSansPackages.japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
sourceHanSansPackages.korean = throw "'sourceHanSansPackages.korean' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
sourceHanSansPackages.simplified-chinese = throw "'sourceHanSansPackages.simplified-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27

17
pkgs/top-level/all-packages.nix
View file

@ -9907,14 +9907,15 @@ with pkgs;
pretendard-std
;
sourceHanPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han { });
source-han-sans = sourceHanPackages.sans;
source-han-serif = sourceHanPackages.serif;
source-han-mono = sourceHanPackages.mono;
source-han-sans-vf-otf = sourceHanPackages.sans-vf-otf;
source-han-sans-vf-ttf = sourceHanPackages.sans-vf-ttf;
source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;
source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;
inherit (callPackage ../data/fonts/source-han { })
source-han-sans
source-han-serif
source-han-mono
source-han-sans-vf-otf
source-han-sans-vf-ttf
source-han-serif-vf-otf
source-han-serif-vf-ttf
;
themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };

1
pkgs/top-level/packages-config.nix
View file

@ -13,7 +13,6 @@
lib.mapAttrs (_: set: lib.recurseIntoAttrs set) {
inherit (super)
rPackages
sourceHanPackages
;
# emacsPackages is an alias for emacs.pkgs