diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/licenses.nix | 5 | ||||
| -rw-r--r-- | lib/maintainers.nix | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index a790b576032d8..1bb153ce4c31a 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -281,6 +281,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; }; + hpnd = spdx { + spdxId = "HPND"; + fullName = "Historic Permission Notice and Disclaimer"; + }; + # Intel's license, seems free iasl = { fullName = "iASL"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6253197fd1f13..ec61151a4fc47 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -193,12 +193,14 @@ erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>"; ertes = "Ertugrul Söylemez <esz@posteo.de>"; ethercrow = "Dmitry Ivanov <ethercrow@gmail.com>"; + etu = "Elis Hirwing <elis@hirwing.se>"; exi = "Reno Reckling <nixos@reckling.org>"; exlevan = "Alexey Levan <exlevan@gmail.com>"; expipiplus1 = "Joe Hermaszewski <nix@monoid.al>"; fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>"; - fare = "Francois-Rene Rideau <fahree@gmail.com>"; falsifian = "James Cook <james.cook@utoronto.ca>"; + fare = "Francois-Rene Rideau <fahree@gmail.com>"; + fgaz = "Francesco Gazzetta <francygazz@gmail.com>"; florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>"; flosse = "Markus Kohlhase <mail@markus-kohlhase.de>"; fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>"; @@ -290,12 +292,12 @@ jonafato = "Jon Banafato <jon@jonafato.com>"; jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>"; jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>"; - jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>"; jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>"; jtojnar = "Jan Tojnar <jtojnar@gmail.com>"; juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>"; jwiegley = "John Wiegley <johnw@newartisans.com>"; jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>"; + jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>"; jzellner = "Jeff Zellner <jeffz@eml.cc>"; kaiha = "Kai Harries <kai.harries@gmail.com>"; kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>"; @@ -335,6 +337,7 @@ lovek323 = "Jason O'Conal <jason@oconal.id.au>"; lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>"; lsix = "Lancelot SIX <lsix@lancelotsix.com>"; + ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>"; lucas8 = "Luc Chabassier <luc.linux@mailoo.org>"; ludo = "Ludovic Courtès <ludo@gnu.org>"; lufia = "Kyohei Kadota <lufia@lufia.org>"; @@ -498,6 +501,7 @@ renzo = "Renzo Carbonara <renzocarbonara@gmail.com>"; retrry = "Tadas Barzdžius <retrry@gmail.com>"; rht = "rht <rhtbot@protonmail.com>"; + richardipsum = "Richard Ipsum <richardipsum@fastmail.co.uk>"; rick68 = "Wei-Ming Yang <rick68@gmail.com>"; rickynils = "Rickard Nilsson <rickynils@gmail.com>"; ris = "Robert Scott <code@humanleg.org.uk>"; @@ -507,6 +511,7 @@ robberer = "Longrin Wischnewski <robberer@freakmail.de>"; robbinch = "Robbin C. <robbinch33@gmail.com>"; roberth = "Robert Hensing <nixpkgs@roberthensing.nl>"; + robertodr = "Roberto Di Remigio <roberto.diremigio@gmail.com>"; robgssp = "Rob Glossop <robgssp@gmail.com>"; roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>"; roconnor = "Russell O'Connor <roconnor@theorem.ca>"; @@ -571,6 +576,7 @@ swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>"; swflint = "Samuel W. Flint <swflint@flintfam.org>"; swistak35 = "Rafał Łasocha <me@swistak35.com>"; + symphorien = "Guillaume Girol <symphorien_nixpkgs@xlumurb.eu>"; szczyp = "Szczyp <qb@szczyp.com>"; sztupi = "Attila Sztupak <attila.sztupak@gmail.com>"; taeer = "Taeer Bar-Yam <taeer@necsi.edu>"; @@ -580,10 +586,9 @@ taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>"; tari = "Peter Marheine <peter@taricorp.net>"; tavyc = "Octavian Cerna <octavian.cerna@gmail.com>"; - ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>"; teh = "Tom Hunger <tehunger@gmail.com>"; - teto = "Matthieu Coudron <mcoudron@hotmail.com>"; telotortium = "Robert Irelan <rirelan@gmail.com>"; + teto = "Matthieu Coudron <mcoudron@hotmail.com>"; thall = "Niclas Thall <niclas.thall@gmail.com>"; thammers = "Tobias Hammerschmidt <jawr@gmx.de>"; the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>"; @@ -612,6 +617,7 @@ #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012 uwap = "uwap <me@uwap.name>"; vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>"; + valeriangalliat = "Valérian Galliat <val@codejam.info>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>"; vanschelven = "Klaas van Schelven <klaas@vanschelven.com>"; vanzef = "Ivan Solyankin <vanzef@gmail.com>"; @@ -628,7 +634,6 @@ vlstill = "Vladimír Štill <xstill@fi.muni.cz>"; vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>"; vmchale = "Vanessa McHale <tmchale@wisc.edu>"; - valeriangalliat = "Valérian Galliat <val@codejam.info>"; volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>"; volth = "Jaroslavas Pocepko <jaroslavas@volth.com>"; vozz = "Oliver Hunt <oliver.huntuk@gmail.com>"; @@ -650,6 +655,7 @@ xvapx = "Marti Serra <marti.serra.coscollano@gmail.com>"; xwvvvvwx = "David Terry <davidterry@posteo.de>"; yarr = "Dmitry V. <savraz@gmail.com>"; + yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>"; yochai = "Yochai <yochai@titat.info>"; yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>"; yuriaisaka = "Yuri Aisaka <yuri.aisaka+nix@gmail.com>"; |