diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-19 12:01:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-19 12:01:22 +0000 |
commit | bbaff9a043d0bea6eef68b7e87ee71caafe50d5c (patch) | |
tree | ded704aba47a6169e5f5ac7531802f23004ea7eb /pkgs/data | |
parent | cea1c3f0cddbd290d326e9dccb3fbb56d4d49578 (diff) | |
parent | 678b994771c7fadfb3d7d3d96ee63fdf6fc574d0 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/sil-abyssinica/default.nix | 16 | ||||
-rw-r--r-- | pkgs/data/fonts/sil-padauk/default.nix | 23 |
2 files changed, 20 insertions, 19 deletions
diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index c884b5567dd72..7cefdf077610b 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -1,23 +1,25 @@ { fetchzip, lib }: let - version = "1.500"; + version = "2.100"; in -fetchzip { +fetchzip rec { name = "sil-abyssinica-${version}"; - url = "mirror://debian/pool/main/f/fonts-sil-abyssinica/fonts-sil-abyssinica_${version}.orig.tar.xz"; - sha256 = "sha256-fCa88wG2JfHTaHaBkuvoncbcbrh3XNzc8ewS3W+W/fM="; + url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; + sha256 = "sha256-06olbIdSlhJ4hgblzzabqIs57FpsyWIdPDFXb9vK31A="; postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts AbyssinicaSIL-${version}/AbyssinicaSIL-R.ttf + rm -rf $out/web + mkdir -p $out/share/{fonts/truetype,doc/${name}} + mv $out/*.ttf $out/share/fonts/truetype/ + mv $out/*.txt $out/documentation $out/share/doc/${name}/ ''; meta = with lib; { description = "Unicode font for Ethiopian and Erythrean scripts (Amharic et al.)"; homepage = "https://software.sil.org/abyssinica/"; license = licenses.ofl; - maintainers = with lib.maintainers; [ serge ]; + maintainers = with maintainers; [ serge ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/data/fonts/sil-padauk/default.nix index 1b574e2da2de7..b993ef5ae6b68 100644 --- a/pkgs/data/fonts/sil-padauk/default.nix +++ b/pkgs/data/fonts/sil-padauk/default.nix @@ -1,27 +1,26 @@ { fetchzip, lib }: let - version = "3.003"; + version = "5.001"; in -fetchzip { +fetchzip rec { name = "sil-padauk-${version}"; - url = "mirror://debian/pool/main/f/fonts-sil-padauk/fonts-sil-padauk_${version}.orig.tar.xz"; - sha256 = "sha256-oK+EufbvsqXunTgcWj+DiNdfpRl+VPO60Wc9KYjZv5A="; + url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip"; + sha256 = "sha256-6H9EDmXr1Ox2fgLw9sG5JrCAllK3tbjvMfLi8DTF1f0="; postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 - mkdir -p $out/share/fonts - cp *.ttf $out/share/fonts + mkdir -p $out/share/fonts/truetype + rm -rf $out/{manifest.json,web/} + mv $out/*.ttf $out/share/fonts/truetype/ + mkdir -p $out/share/doc/${name} + mv $out/*.txt $out/documentation/ $out/share/doc/${name}/ ''; meta = with lib; { - description = "Burmese Unicode 6 TrueType font"; + description = "A Unicode-based font family with broad support for writing systems that use the Myanmar script"; homepage = "https://software.sil.org/padauk"; license = licenses.ofl; - maintainers = with lib.maintainers; [ serge ]; + maintainers = with maintainers; [ serge ]; platforms = platforms.all; }; } |