Merge pull request #55967 from Mic92/font-awesome

font-awesome_5: 5.6.3 -> 5.7.2
This commit is contained in:
Jörg Thalheim 2019-02-26 14:12:52 +00:00 committed by GitHub
commit 699d313052
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 32 deletions

View File

@ -1,28 +0,0 @@
{ stdenv, fetchzip }:
let
version = "4.7.0";
in fetchzip rec {
name = "font-awesome-${version}";
url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype
'';
sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s";
meta = with stdenv.lib; {
description = "Font Awesome - TTF font";
longDescription = ''
Font Awesome gives you scalable vector icons that can instantly be customized.
This package includes only the TTF 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 ];
};
}

View File

@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
version = "5.6.3";
version = "5.7.2";
in fetchzip rec {
name = "font-awesome-${version}";
@ -12,7 +12,7 @@ in fetchzip rec {
unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
'';
sha256 = "0y3zar7hyx5pj8rpyk2kz3sx6zgrfif2ka2h4rg0b8h8qbja0al6";
sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al";
meta = with stdenv.lib; {
description = "Font Awesome - OTF font";

View File

@ -99,7 +99,7 @@ mapAliases ({
firefox-wrapper = firefox; # 2016-01
firefoxWrapper = firefox; # 2015-09
flameGraph = flamegraph; # added 2018-04-25
font-awesome-ttf = font-awesome_4; # 2018-02-25
font-awesome-ttf = font-awesome; # 2018-02-25
foomatic_filters = foomatic-filters; # 2016-08
fuse_exfat = exfat; # 2015-09-11
fuseki = apache-jena-fuseki; # added 2018-04-25

View File

@ -15596,8 +15596,8 @@ in
fira-mono = callPackage ../data/fonts/fira-mono { };
font-awesome_4 = callPackage ../data/fonts/font-awesome-4 { };
font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { };
font-awesome = font-awesome_5;
freefont_ttf = callPackage ../data/fonts/freefont-ttf { };