diff --git a/lib/licenses.nix b/lib/licenses.nix index 1596c319bd0..e3b551953fd 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -255,6 +255,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "LaTeX Project Public License v1.2"; }; + lppl13c = spdx { + spdxId = "LPPL-1.3c"; + fullName = "LaTeX Project Public License v1.3c"; + }; + lpl-102 = spdx { spdxId = "LPL-1.02"; fullName = "Lucent Public License v1.02"; diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix new file mode 100644 index 00000000000..46b947ce77a --- /dev/null +++ b/pkgs/data/fonts/gyre/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "gyre-fonts"; + version = "2.005"; + name="${baseName}-${version}"; + + src = fetchurl { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip"; + sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"; + }; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.otf $out/share/fonts/truetype + ''; + + meta = { + description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; + + longDescription = ''The Gyre project started in 2006, and will + eventually include enhanced releases of all 35 freely available + PostScript fonts distributed with Ghostscript v4.00. These are + being converted to OpenType and extended with diacritical marks + covering all modern European languages and then some''; + + homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; + + license = stdenv.lib.licenses.lppl13c; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix new file mode 100644 index 00000000000..c592ac2d38b --- /dev/null +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -0,0 +1,79 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "league-of-moveable-type"; + version = "2014-12"; + name="${baseName}-${version}"; + + srcs = [(fetchurl { + url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; + sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; + name = "league-gothic.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/fanwood/download"; + sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; + name = "fanwood.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; + sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; + name = "linden-hill.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/raleway/download"; + sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; + name = "raleway.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/prociono/download"; + sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; + name = "prociono.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; + sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; + name = "goudy-bookletter-1911.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; + sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; + name = "sorts-mill-goudy.zip"; + }) + + +]; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp */*.otf $out/share/fonts/truetype + ''; + + + meta = { + description = "Font Collection by The League of Moveable Type"; + + longDescription = '' We're done with the tired old fontstacks of + yesteryear. The web is no longer limited, and now it's time to raise + our standards. Since 2009, The League has given only the most + well-made, free & open-source, @font-face ready fonts. + ''; + + homepage = "https://www.theleagueofmoveabletype.com/"; + + license = stdenv.lib.licenses.ofl; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index aa0c1dbd77b..bcbf5749810 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = "unknown"; platforms = stdenv.lib.platforms.all; - maintainers = [ "Daniel Bergey " ]; + maintainers = with stdenv.lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43137bb4e1b..e4079defa3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8906,6 +8906,8 @@ let inherit (gnome3) gsettings_desktop_schemas; + gyre-fonts = callPackage ../data/fonts/gyre {}; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; @@ -8918,6 +8920,8 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; liberation_ttf = liberation_ttf_binary;