diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-12 00:14:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-12 00:14:26 +0000 |
commit | 78e55d66b306e7cf5f67ddfdacc8d1eb4767f4e2 (patch) | |
tree | eb2767a55ffcc35951d7949220b887e2fd25d33f /pkgs/data | |
parent | 130c469a35d5535a731a4d3d516e78dd4ffb030b (diff) | |
parent | 143aa3e88ca9250520d323083191bdc91fb79ad7 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/font-awesome/default.nix (renamed from pkgs/data/fonts/font-awesome-5/default.nix) | 14 | ||||
-rw-r--r-- | pkgs/data/fonts/sil-abyssinica/default.nix | 23 |
2 files changed, 33 insertions, 4 deletions
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 7f251232ebc10..3403660b1e8ff 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version}: fetchFromGitHub { + font-awesome = { version, sha256, rev ? version }: fetchFromGitHub { name = "font-awesome-${version}"; @@ -21,18 +21,20 @@ let Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the OTF font. For full CSS etc. see the project website. ''; - homepage = "http://fortawesome.github.io/Font-Awesome/"; + homepage = "https://fontawesome.com/"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ abaldeau johnazoidberg ]; }; }; -in { - # Keeping version 4 because version 5 is incompatible for some icons. That +in +{ + # Keeping version 4 and 5 because version 6 is incompatible for some icons. That # means that projects which depend on it need to actively convert the # symbols. See: # https://github.com/greshake/i3status-rust/issues/130 # https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4 + # https://fontawesome.com/v6/docs/web/setup/upgrade/ v4 = font-awesome { version = "4.7.0"; rev = "v4.7.0"; @@ -42,4 +44,8 @@ in { version = "5.15.3"; sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0="; }; + v6 = font-awesome { + version = "6.1.1"; + sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA"; + }; } diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix new file mode 100644 index 0000000000000..c884b5567dd72 --- /dev/null +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -0,0 +1,23 @@ +{ fetchzip, lib }: + +let + version = "1.500"; +in +fetchzip { + 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="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts AbyssinicaSIL-${version}/AbyssinicaSIL-R.ttf + ''; + + 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 ]; + platforms = platforms.all; + }; +} |