diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 776b87c80f7a..edfdc6e5c3f5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -500,6 +500,7 @@ tailhook = "Paul Colomiets "; takikawa = "Asumu Takikawa "; taktoa = "Remy Goldschmidt "; + taku0 = "Takuo Yonezawa "; tavyc = "Octavian Cerna "; teh = "Tom Hunger "; telotortium = "Robert Irelan "; diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix index 11132710a905..b69358c2c75a 100644 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -23,10 +23,11 @@ let ''; meta = { - description = "${language} subset of an open source Pan-CJK typeface"; + description = "${language} subset of an open source Pan-CJK sans-serif typeface"; homepage = https://github.com/adobe-fonts/source-han-sans; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; }; }; in diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix new file mode 100644 index 000000000000..148f5a4538f5 --- /dev/null +++ b/pkgs/data/fonts/source-han-serif/default.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, unzip}: + +let + makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + version = "1.000R"; + name = "source-han-serif-${variant}-${version}"; + revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; + inherit sha256; + }; + + setSourceRoot = '' + sourceRoot=$( echo SourceHanSerif* ) + ''; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp $( find . -name '*.otf' ) $out/share/fonts/opentype + ''; + + meta = { + description = "${language} subset of an open source Pan-CJK serif typeface"; + homepage = https://github.com/adobe-fonts/source-han-sans; + license = stdenv.lib.licenses.ofl; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + }; +in +{ + japanese = makePackage { + variant = "japanese"; + language = "Japanese"; + region = "JP"; + sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7"; + }; + korean = makePackage { + variant = "korean"; + language = "Korean"; + region = "KR"; + sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r"; + }; + simplified-chinese = makePackage { + variant = "simplified-chinese"; + language = "Simplified Chinese"; + region = "CN"; + sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43"; + }; + traditional-chinese = makePackage { + variant = "traditional-chinese"; + language = "Traditional Chinese"; + region = "TW"; + sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f83222222637..4cf2e215dc10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12630,6 +12630,11 @@ with pkgs; source-han-sans-korean = sourceHanSansPackages.korean; source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese; source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese; + sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { }; + source-han-serif-japanese = sourceHanSerifPackages.japanese; + source-han-serif-korean = sourceHanSerifPackages.korean; + source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; + source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;