From 6e37ec0c483ec3e98f4122a58453db2507721667 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Oct 2022 09:56:52 +0200
Subject: [PATCH] =?UTF-8?q?sil-abyssinica:=201.500=20=E2=86=92=202.100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/data/fonts/sil-abyssinica/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix
index c884b5567dd7..7cefdf077610 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;
   };
 }