diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 11 | ||||
-rw-r--r-- | lib/maintainers.nix | 6 | ||||
-rw-r--r-- | lib/options.nix | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 0086bd63ebd..2262ae9ebbc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -79,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''Beerware License''; }; + bsd0 = spdx { + spdxId = "0BSD"; + fullName = "BSD Zero Clause License"; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; @@ -482,6 +487,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "PostgreSQL License"; }; + postman = { + fullName = "Postman EULA"; + url = https://www.getpostman.com/licenses/postman_base_app; + free = false; + }; + psfl = spdx { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b73a2854c78..afbe5a95508 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -47,6 +47,7 @@ andir = "Andreas Rammhold <andreas@rammhold.de>"; andres = "Andres Loeh <ksnixos@andres-loeh.de>"; andrestylianos = "Andre S. Ramos <andre.stylianos@gmail.com>"; + andrew-d = "Andrew Dunham <andrew@du.nham.ca>"; andrewrk = "Andrew Kelley <superjoe30@gmail.com>"; andsild = "Anders Sildnes <andsild@gmail.com>"; aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>"; @@ -492,6 +493,7 @@ nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>"; nico202 = "Nicolò Balzarotti <anothersms@gmail.com>"; NikolaMandic = "Ratko Mladic <nikola@mandic.email>"; + nipav = "Niko Pavlinek <niko.pavlinek@gmail.com>"; nixy = "Andrew R. M. <nixy@nixy.moe>"; nmattia = "Nicolas Mattia <nicolas@nmattia.com>"; nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>"; @@ -552,7 +554,7 @@ pradeepchhetri = "Pradeep Chhetri <pradeep.chhetri89@gmail.com>"; prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>"; primeos = "Michael Weiss <dev.primeos@gmail.com>"; - profpatsch = "Profpatsch <mail@profpatsch.de>"; + Profpatsch = "Profpatsch <mail@profpatsch.de>"; proglodyte = "Proglodyte <proglodyte23@gmail.com>"; pshendry = "Paul Hendry <paul@pshendry.com>"; psibi = "Sibi <sibi@psibi.in>"; @@ -715,6 +717,7 @@ utdemir = "Utku Demir <me@utdemir.com>"; #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012 uwap = "uwap <me@uwap.name>"; + va1entin = "Valentin Heidelberger <github@valentinsblog.com>"; vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>"; valeriangalliat = "Valérian Galliat <val@codejam.info>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>"; @@ -762,6 +765,7 @@ y0no = "Yoann Ono <y0no@y0no.fr>"; yarr = "Dmitry V. <savraz@gmail.com>"; yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>"; + yesbox = "Jesper Geertsen Jonsson <jesper.geertsen.jonsson@gmail.com>"; ylwghst = "Burim Augustin Berisa <ylwghst@onionmail.info>"; yochai = "Yochai <yochai@titat.info>"; yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>"; diff --git a/lib/options.nix b/lib/options.nix index e10c86dd506..9446eca3677 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -85,6 +85,7 @@ rec { concatMap (opt: let docOption = rec { + loc = opt.loc; name = showOption opt.loc; description = opt.description or (throw "Option `${name}' has no description."); declarations = filter (x: x != unknownModule) opt.declarations; |