BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

font-awesome: make font-awesome_5 the defautl

Browse source 
It is confusing that font-awesome_4 is the font,
one get when installing font-awesome-ttf.
I don't really see a use case to keep the old version around.
This commit is contained in:
Jörg Thalheim 2019-02-17 20:40:14 +00:00
parent c3778b3428
commit 0a393f53a9
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
3 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/data/fonts/font-awesome-4/default.nix
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 ];
};
}

2
pkgs/top-level/aliases.nix
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

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

@ -15560,8 +15560,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 { };
@ -21506,7 +21506,7 @@ in
bftools = callPackage ../applications/science/biology/bftools { };
cmtk = callPackage ../applications/science/biology/cmtk { };
cmtk = callPackage ../applications/science/biology/cmtk { };
conglomerate = callPackage ../applications/science/biology/conglomerate { };