Merge pull request #230276 from wrvsrx/noto-fonts-cjk-update

noto-fonts-cjk: update noto-fonts-cjk-sans and noto-fonts-cjk-serif
This commit is contained in:
Weijia Wang 2023-05-06 21:11:03 +03:00 committed by GitHub
commit da914e87cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -89,7 +89,7 @@ rec {
};
};
mkNotoCJK = { typeface, version, rev, sha256 }:
mkNotoCJK = { typeface, version, sha256 }:
stdenvNoCC.mkDerivation {
pname = "noto-fonts-cjk-${lib.toLower typeface}";
inherit version;
@ -97,7 +97,8 @@ rec {
src = fetchFromGitHub {
owner = "googlefonts";
repo = "noto-cjk";
inherit rev sha256;
rev = "${typeface}${version}";
inherit sha256;
sparseCheckout = [ "${typeface}/Variable/OTC" ];
};
@ -154,15 +155,13 @@ rec {
noto-fonts-cjk-sans = mkNotoCJK {
typeface = "Sans";
version = "2.004";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
sha256 = "sha256-PWpcTBnBRK87ZuRI/PsGp2UMQgCCyfkLHwvB1mOl5K0=";
sha256 = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
};
noto-fonts-cjk-serif = mkNotoCJK {
typeface = "Serif";
version = "2.000";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
sha256 = "sha256-1w66Ge7DZjbONGhxSz69uFhfsjMsDiDkrGl6NsoB7dY=";
version = "2.001";
sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg=";
};
noto-fonts-emoji =