diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2019-02-17 20:40:14 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2019-02-17 20:40:14 +0000 |
commit | 0a393f53a9702cea04a6afea506c3a91a1a2bf60 (patch) | |
tree | e43588099d788e29feabbd32d64e99bd9db17186 /pkgs | |
parent | c3778b342895c956b5b31e81e15b31cbb9238898 (diff) | |
download | nixpkgs-0a393f53a9702cea04a6afea506c3a91a1a2bf60.tar nixpkgs-0a393f53a9702cea04a6afea506c3a91a1a2bf60.tar.gz nixpkgs-0a393f53a9702cea04a6afea506c3a91a1a2bf60.tar.bz2 nixpkgs-0a393f53a9702cea04a6afea506c3a91a1a2bf60.tar.lz nixpkgs-0a393f53a9702cea04a6afea506c3a91a1a2bf60.tar.xz nixpkgs-0a393f53a9702cea04a6afea506c3a91a1a2bf60.tar.zst nixpkgs-0a393f53a9702cea04a6afea506c3a91a1a2bf60.zip |
font-awesome: make font-awesome_5 the defautl
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.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/data/fonts/font-awesome-4/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 3 insertions, 31 deletions
diff --git a/pkgs/data/fonts/font-awesome-4/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix deleted file mode 100644 index 34548b97244..00000000000 --- a/pkgs/data/fonts/font-awesome-4/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4442453644c..a44593c8009 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d89497e517..c031127994e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |