Merge pull request #151705 from uakci/mplus-add-github-release

This commit is contained in:
Sandro 2022-03-28 13:40:32 +02:00 committed by GitHub
commit 72dab1fa30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 20 deletions

View File

@ -12794,6 +12794,12 @@
githubId = 1983821;
name = "Eric Wolf";
};
uakci = {
name = "uakci";
email = "uakci@uakci.pl";
github = "uakci";
githubId = 6961268;
};
udono = {
email = "udono@virtual-things.biz";
github = "udono";

View File

@ -1,25 +1,45 @@
{ lib, fetchzip }:
let
version = "063a";
in fetchzip {
name = "mplus-${version}";
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
{ lib, fetchzip, fetchFromGitHub }:
let pname = "mplus-outline-fonts";
in {
osdnRelease = fetchzip {
name = "${pname}-osdn";
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz";
sha256 = "16jirhkjs46ac8cdk2w4xkpv989gmz7i8gnrq9bck13rbil7wlzr";
postFetch = ''
tar -xJf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
mkdir -p $out/share/fonts/truetype/${pname}
tar xvJf $downloadedFile
mv */*.ttf $out/share/fonts/truetype/${pname}
'';
sha256 = "1khbkch2r96ppifc93bmy1v047pgciyhfmcjb98ggncp5ix885xz";
meta = with lib; {
description = "M+ Outline Fonts (legacy OSDN release)";
homepage = "https://mplus-fonts.osdn.jp";
maintainers = with maintainers; [ henrytill uakci ];
platforms = platforms.all;
license = licenses.mit;
};
};
githubRelease = fetchFromGitHub {
name = "${pname}-github";
owner = "coz-m";
repo = "MPLUS_FONTS";
rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932";
sha256 = "1ha92hyzcfbbq682c50k8clbhigc09rcb9mxjzjwqfj9rfp348id";
postFetch = ''
mkdir -p $out/share/fonts/{truetype,opentype}/${pname}
tar xvzf $downloadedFile
mv */fonts/ttf/* $out/share/fonts/truetype/${pname}
mv */fonts/otf/* $out/share/fonts/opentype/${pname}
'';
meta = with lib; {
description = "M+ Outline Fonts";
homepage = "https://mplus-fonts.osdn.jp/about-en.html";
license = licenses.mit;
maintainers = with maintainers; [ henrytill ];
description = "M+ Outline Fonts (GitHub release)";
homepage = "https://mplusfonts.github.io";
maintainers = with maintainers; [ henrytill uakci ];
platforms = platforms.all;
license = licenses.ofl;
};
};
}

View File

@ -24143,7 +24143,7 @@ with pkgs;
mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { };
mplus-outline-fonts = recurseIntoAttrs (callPackage ../data/fonts/mplus-outline-fonts { });
mro-unicode = callPackage ../data/fonts/mro-unicode { };