diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attrsets.nix | 4 | ||||
| -rw-r--r-- | lib/maintainers.nix | 13 | ||||
| -rw-r--r-- | lib/types.nix | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index c1bd764c70dc..f9e6b7495fc5 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1,12 +1,12 @@ # Operations on attribute sets. -with { +let inherit (builtins) head tail length; inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; inherit (import ./lists.nix) concatMap concatLists all deepSeqList; -}; +in rec { inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 5ce97379a12e..9d59ebc9e3ea 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -25,6 +25,7 @@ aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>"; aherrmann = "Andreas Herrmann <andreash87@gmx.ch>"; + ahmedtd = "Taahir Ahmed <ahmed.taahir@gmail.com>"; ak = "Alexander Kjeldaas <ak@formalprivacy.com>"; akaWolf = "Artjom Vejsel <akawolf0@gmail.com>"; akc = "Anders Claesson <akc@akc.is>"; @@ -136,6 +137,7 @@ dgonyeo = "Derek Gonyeo <derek@gonyeo.com>"; dipinhora = "Dipin Hora <dipinhora+github@gmail.com>"; dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>"; + DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>"; dmjio = "David Johnson <djohnson.m@gmail.com>"; dochang = "Desmond O. Chang <dochang@gmail.com>"; domenkozar = "Domen Kozar <domen@dev.si>"; @@ -143,6 +145,7 @@ dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>"; drets = "Dmytro Rets <dmitryrets@gmail.com>"; drewkett = "Andrew Burkett <burkett.andrew@gmail.com>"; + dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>"; dtzWill = "Will Dietz <nix@wdtz.org>"; e-user = "Alexander Kahl <nixos@sodosopa.io>"; ebzzry = "Rommel Martinez <ebzzry@gmail.com>"; @@ -158,6 +161,7 @@ eleanor = "Dejan Lukan <dejan@proteansec.com>"; elitak = "Eric Litak <elitak@gmail.com>"; ellis = "Ellis Whitehead <nixos@ellisw.net>"; + eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>"; epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>"; ericbmerritt = "Eric Merritt <eric@afiniate.com>"; ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>"; @@ -182,6 +186,7 @@ ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>"; funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>"; fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>"; + fuzzy-id = "Thomas Bach <hacking+nixos@babibo.de>"; fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>"; gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>"; garbas = "Rok Garbas <rok@garbas.si>"; @@ -214,6 +219,7 @@ ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; igsha = "Igor Sharonov <igor.sharonov@gmail.com>"; ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>"; + infinisil = "Silvan Mosberger <infinisil@icloud.com"; ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; @@ -240,6 +246,7 @@ jonafato = "Jon Banafato <jon@jonafato.com>"; jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>"; jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>"; + jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>"; jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>"; juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>"; jwiegley = "John Wiegley <johnw@newartisans.com>"; @@ -317,6 +324,7 @@ michalrus = "Michal Rus <m@michalrus.com>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; mikefaille = "Michaël Faille <michael@faille.io>"; + miltador = "Vasiliy Solovey <miltador@yandex.ua>"; mimadrid = "Miguel Madrid <mimadrid@ucm.es>"; mingchuan = "Ming Chuan <ming@culpring.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; @@ -462,6 +470,7 @@ sepi = "Raffael Mancini <raffael@mancini.lu>"; seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>"; shanemikel = "Shane Pearlman <shanemikel1@gmail.com>"; + shawndellysse = "Shawn Dellysse <sdellysse@gmail.com>"; sheenobu = "Sheena Artrip <sheena.artrip@gmail.com>"; sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>"; shell = "Shell Turner <cam.turn@gmail.com>"; @@ -495,6 +504,7 @@ tailhook = "Paul Colomiets <paul@colomiets.name>"; takikawa = "Asumu Takikawa <asumu@igalia.com>"; taktoa = "Remy Goldschmidt <taktoa@gmail.com>"; + taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>"; tavyc = "Octavian Cerna <octavian.cerna@gmail.com>"; teh = "Tom Hunger <tehunger@gmail.com>"; telotortium = "Robert Irelan <rirelan@gmail.com>"; @@ -517,7 +527,8 @@ tvorog = "Marsel Zaripov <marszaripov@gmail.com>"; twey = "James ‘Twey’ Kay <twey@twey.co.uk>"; uralbash = "Svintsov Dmitry <root@uralbash.ru>"; - urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; + utdemir = "Utku Demir <me@utdemir.com>"; + #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012 uwap = "uwap <me@uwap.name>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>"; vanzef = "Ivan Solyankin <vanzef@gmail.com>"; diff --git a/lib/types.nix b/lib/types.nix index 175cb7472bf6..c834cc8e6534 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -6,7 +6,7 @@ with import ./attrsets.nix; with import ./options.nix; with import ./trivial.nix; with import ./strings.nix; -with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; }; +let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in rec { |