diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-29 11:33:28 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-29 11:33:28 -0500 |
commit | 1fe28a11327ad7695ee9f023c74bd47894494bcb (patch) | |
tree | e9709816cebecf2e31a36ffcb3e1f0e607175bdc /pkgs/data | |
parent | 85aafda509b626e68595facba1aeb7da336ce537 (diff) | |
parent | 182acabbae644182ee6dafc9779e63abd7991f8c (diff) |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/comic-neue/default.nix | 24 | ||||
-rw-r--r-- | pkgs/data/fonts/dina/default.nix | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 91608d17db446..5d3da910e0b2e 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl +, unzip }: stdenv.mkDerivation rec { - name = "comic-neue-1.1"; + name = "comic-neue-${version}"; + version = "2.2"; src = fetchurl { - url = "http://comicneue.com/comic-neue-1.1.zip"; - sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923"; + url = "http://comicneue.com/${name}.zip"; + sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" ]; sourceRoot = name; installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name} + cp -v OTF/*.otf $out/share/fonts/opentype + cp -v Web/*.ttf $out/share/fonts/truetype + cp -v Web/*.eot $out/share/fonts/EOT + cp -v Web/*.woff $out/share/fonts/WOFF + cp -v Web/*.woff2 $out/share/fonts/WOFF2 + cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name} ''; meta = with stdenv.lib; { @@ -27,7 +34,8 @@ stdenv.mkDerivation rec { the latter angular terminals. Both variants come in Light, Regular, and Bold weights with Oblique variants. ''; - license = licenses.cc0; + license = licenses.ofl; platforms = platforms.all; + maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index da7a1bc5fb9e1..e79dcd014d3b7 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; meta = with stdenv.lib; { - description = "A monospace bitmap font aimed at programmers."; + description = "A monospace bitmap font aimed at programmers"; longDescription = '' Dina is a monospace bitmap font, primarily aimed at programmers. It is relatively compact to allow a lot of code on screen, while (hopefully) |