summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Bergey <bergey@alum.mit.edu>2014-12-19 20:00:52 +0000
committerDaniel Bergey <bergey@alum.mit.edu>2014-12-19 20:07:53 +0000
commit4c064b547810869575e59c9ae0f981d2c30be137 (patch)
tree36936526ac390e437b2c60b18a192dec568ee30b
parenta2db5ebf20bf3104514033c22155fef3c23e8851 (diff)
downloadnixpkgs-4c064b547810869575e59c9ae0f981d2c30be137.tar
nixpkgs-4c064b547810869575e59c9ae0f981d2c30be137.tar.gz
nixpkgs-4c064b547810869575e59c9ae0f981d2c30be137.tar.bz2
nixpkgs-4c064b547810869575e59c9ae0f981d2c30be137.tar.lz
nixpkgs-4c064b547810869575e59c9ae0f981d2c30be137.tar.xz
nixpkgs-4c064b547810869575e59c9ae0f981d2c30be137.tar.zst
nixpkgs-4c064b547810869575e59c9ae0f981d2c30be137.zip
add LaTeX Project Public License v1.3c for Gyre
use lib.maintainers
-rw-r--r--lib/licenses.nix5
-rw-r--r--pkgs/data/fonts/gyre/default.nix5
-rw-r--r--pkgs/data/fonts/nafees/default.nix2
3 files changed, 8 insertions, 4 deletions
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
index 95f6ccd6820..2fc94f8f355 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 <bergey@teallabs.org>" ];
+    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 <bergey@teallabs.org>" ];
+    maintainers = with stdenv.lib.maintainers; [ bergey ];
   };
 }