From 4c064b547810869575e59c9ae0f981d2c30be137 Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Fri, 19 Dec 2014 20:00:52 +0000 Subject: [PATCH] add LaTeX Project Public License v1.3c for Gyre use lib.maintainers --- lib/licenses.nix | 5 +++++ pkgs/data/fonts/gyre/default.nix | 5 ++--- pkgs/data/fonts/nafees/default.nix | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1596c319bd0a..e3b551953fdd 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 index 95f6ccd6820a..2fc94f8f355d 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; - # GUST Font License: http://www.gust.org.pl/projects/e-foundry/licenses - license = "unknown"; + license = stdenv.lib.licenses.lppl13c; platforms = stdenv.lib.platforms.all; - maintainers = [ "Daniel Bergey " ]; + maintainers = with stdenv.lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index aa0c1dbd77ba..bcbf57498106 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 ]; }; }