From 60e76dfff86cf93483240159172449c66d0efcc5 Mon Sep 17 00:00:00 2001
From: Merlin Göttlinger <megoettlinger@gmail.com>
Date: Sat, 30 Dec 2017 20:39:17 +0100
Subject: icesl: init at 2.1.10

---
 lib/licenses.nix    | 6 ++++++
 lib/maintainers.nix | 1 +
 2 files changed, 7 insertions(+)

(limited to 'lib')

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 1f2c448470b3..1fdcc15fd725 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free      = false;
   };
 
+  inria-icesl = {
+    fullName = "INRIA Non-Commercial License Agreement for IceSL";
+    url      = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf";
+    free     = false;
+  };
+
   ipa = spdx {
     spdxId = "IPA";
     fullName = "IPA Font License";
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f4af4fe366b7..fd9d673b3b08 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -421,6 +421,7 @@
   meisternu = "Matt Miemiec <meister@krutt.org>";
   metabar = "Celine Mercier <softs@metabarcoding.org>";
   mgdelacroix = "Miguel de la Cruz <mgdelacroix@gmail.com>";
+  mgttlinger = "Merlin Göttlinger <megoettlinger@gmail.com";
   mguentner = "Maximilian Güntner <code@klandest.in>";
   mic92 = "Jörg Thalheim <joerg@thalheim.io>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
-- 
cgit 1.4.1