diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-01-04 19:29:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 19:29:11 +0000 |
| commit | cf944e4c1205281ad0a6b2e88be2107fa68b2842 (patch) | |
| tree | 34b05eb9bef388a35269a8d8a174c5b982b52dd8 /lib | |
| parent | 23d4ac89f3492eb99cbf1dc0fc5eb8c0703d55a2 (diff) | |
| parent | 60e76dfff86cf93483240159172449c66d0efcc5 (diff) | |
Merge pull request #33344 from dtzWill/feature/icesl
icesl: init at 2.1.10
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/licenses.nix | 6 | ||||
| -rw-r--r-- | lib/maintainers.nix | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 1f2c448470b38..1fdcc15fd7254 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 e31fc307e4c9a..13e66a55b9142 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>"; |