Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

font-awesome_4: Readd, font-awesome_5: 5.9.0 -> 5.10.0 #65240

Merged
merged 2 commits into from
Jul 30, 2019
Merged

font-awesome_4: Readd, font-awesome_5: 5.9.0 -> 5.10.0 #65240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da40bc4
font-awesome_4: Was removed, add again
JohnAZoidberg Jul 21, 2019
5374037
font-awesome: 5.9.0 -> 5.10.0
JohnAZoidberg Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 37 additions & 22 deletions pkgs/data/fonts/font-awesome-5/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,45 @@
{ lib, fetchFromGitHub }:

let
version = "5.9.0";
in fetchFromGitHub rec {
name = "font-awesome-${version}";

owner = "FortAwesome";
repo = "Font-Awesome";
rev = version;
font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec {
name = "font-awesome-${version}";

postFetch = ''
tar xf $downloadedFile --strip=1
install -m444 -Dt $out/share/fonts/opentype otfs/*.otf
'';

sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii";
owner = "FortAwesome";
repo = "Font-Awesome";
inherit rev;

meta = with lib; {
description = "Font Awesome - OTF font";
longDescription = ''
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.
postFetch = ''
tar xf $downloadedFile --strip=1
install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
'';
homepage = http://fortawesome.github.io/Font-Awesome/;
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ abaldeau ];

inherit sha256;

meta = with lib; {
description = "Font Awesome - OTF font";
longDescription = ''
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/";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ abaldeau johnazoidberg ];
};
};
in {
# Keeping version 4 because version 5 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
v4 = font-awesome {
version = "4.7.0";
rev = "v4.7.0";
sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
};
v5 = font-awesome {
version = "5.10.0";
sha256 = "11nga1drlpkrmw307ga6plbj5z1b70cnckr465z8z6vkbcd6jkv3";
};
}
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16393,7 +16393,8 @@ in

fira-mono = callPackage ../data/fonts/fira-mono { };

font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { };
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;

freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
Expand Down