noto fonts and tools: update to newer tagged releases (#31543)

* noto fonts and tools: update to newer tagged releases

* noto-tools: split out to a separate file
This commit is contained in:
Benjamin Staffin 2017-11-22 00:19:48 -05:00 committed by GitHub
parent 7059c88290
commit a1e340fab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 35 deletions

View File

@ -2,10 +2,10 @@
rec {
# 18MB
noto-fonts = let version = "git-2016-03-29"; in fetchzip {
noto-fonts = let version = "2017-10-24-phase3-second-cleanup"; in fetchzip {
name = "noto-fonts-${version}";
url = https://github.com/googlei18n/noto-fonts/archive/e8b0af48b15d64bd490edab4418b5e396cf29644.zip;
url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
postFetch = ''
unzip $downloadedFile
@ -17,7 +17,7 @@ rec {
cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto
cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto
'';
sha256 = "0wphc8671dpbx3rxzmjisnjipg2c2vkhw2i6mmyamd6vvcwajd64";
sha256 = "013l816cq9svdji266sccscm9sf9pfn472gq9lnqkzlwaxx9qrrl";
meta = with stdenv.lib; {
inherit version;
@ -75,14 +75,14 @@ rec {
};
};
# 12MB
noto-fonts-emoji = let version = "git-2016-03-17"; in stdenv.mkDerivation {
noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation {
name = "noto-fonts-emoji-${version}";
src = fetchFromGitHub {
owner = "googlei18n";
repo = "noto-emoji";
rev = "c6379827aaa9cb0baca1a08a9d44ae74ca505236";
sha256 = "1zh1b617cjr5laha6lx0ys4k1c3az2zkgzjwc2nlb7dsdmfw1n0q";
rev = "v${version}";
sha256 = "1ixz03207kzh6jhmw8bpi77pxkfzq46dk26sr41m5kkvc14d14vl";
};
buildInputs = [ cairo ];

View File

@ -0,0 +1,32 @@
{ fetchFromGitHub, pythonPackages, lib }:
pythonPackages.buildPythonPackage rec {
version = "2017-09-25";
name = "nototools-${version}";
src = fetchFromGitHub {
owner = "googlei18n";
repo = "nototools";
rev = "v2017-09-25-tooling-for-phase3-update";
sha256 = "03nzvcvwmrhfrcjhg218q2f3hfrm3vlivp4rk19sc397kh3hisiz";
};
propagatedBuildInputs = with pythonPackages; [ fonttools numpy ];
postPatch = ''
sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py
'';
postInstall = ''
cp -r third_party $out
'';
disabled = pythonPackages.isPy3k;
meta = {
description = "Noto fonts support tools and scripts plus web site generation";
license = lib.licenses.asl20;
homepage = https://github.com/googlei18n/nototools;
platform = lib.platforms.unix;
};
}

View File

@ -10976,35 +10976,7 @@ in {
};
};
nototools = buildPythonPackage rec {
version = "git-2016-03-25";
name = "nototools-${version}";
src = pkgs.fetchFromGitHub {
owner = "googlei18n";
repo = "nototools";
rev = "4f7b067d1b18f59288e5eaee34db5b0abd3a3f63";
sha256 = "05brbkfg77ij4pmcrhq9302albzdalr9gv6jfdsbyyi2k8j85gbn";
};
propagatedBuildInputs = with self; [ fonttools numpy ];
postPatch = ''
sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py
'';
postInstall = ''
cp -r third_party $out
'';
disabled = isPy3k;
meta = {
description = "Noto fonts support tools and scripts plus web site generation";
license = licenses.asl20;
homepage = https://github.com/googlei18n/nototools;
};
};
notoTools = callPackage ../data/fonts/noto-fonts/tools.nix { };
rainbowstream = buildPythonPackage rec {
name = "rainbowstream-${version}";