alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #170037 from fersilva16/update/font-awesome

Browse source 
font-awesome: 5.15.3 -> 6.1.1
This commit is contained in:
Bobby Rong 2022-05-11 22:00:05 +08:00 committed by GitHub
parent a4022cf3de 3fd5f63834
commit e6d7f2b44f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/data/fonts/font-awesome-5/default.nix → pkgs/data/fonts/font-awesome/default.nix
View file

@ -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";
};
}

7
pkgs/top-level/all-packages.nix
View file

@ -24255,9 +24255,10 @@ with pkgs;
flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { };
flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { };
font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
font-awesome = font-awesome_5;
font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4;
font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5;
font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6;
font-awesome = font-awesome_6;
fraunces = callPackage ../data/fonts/fraunces { };