diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 4 | ||||
| -rw-r--r-- | lib/types.nix | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ccdf1e5b7a5..e6dd349676f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -137,6 +137,7 @@ cryptix = "Henry Bubert <cryptix@riseup.net>"; CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>"; cstrahan = "Charles Strahan <charles@cstrahan.com>"; + csingley = "Christopher Singley <csingley@gmail.com>"; cwoac = "Oliver Matthews <oliver@codersoffortune.net>"; DamienCassou = "Damien Cassou <damien@cassou.me>"; danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>"; @@ -443,7 +444,7 @@ nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>"; nico202 = "Nicolò Balzarotti <anothersms@gmail.com>"; NikolaMandic = "Ratko Mladic <nikola@mandic.email>"; - nixy = "Andrew R. M. <andrewmiller237@gmail.com>"; + nixy = "Andrew R. M. <nixy@nixy.moe>"; nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>"; notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>"; @@ -585,6 +586,7 @@ snyh = "Xia Bin <snyh@snyh.org>"; solson = "Scott Olson <scott@solson.me>"; sorpaas = "Wei Tang <hi@that.world>"; + sorki = "Richard Marko <srk@48.io>"; spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>"; spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>"; spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>"; diff --git a/lib/types.nix b/lib/types.nix index c48e3b3000c..db3bd381523 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -288,8 +288,17 @@ rec { }).config; getSubOptions = prefix: (evalModules { modules = opts'; inherit prefix; - # FIXME: hack to get shit to evaluate. - args = { name = ""; }; }).options; + # This is a work-around due to the fact that some sub-modules, + # such as the one included in an attribute set, expects a "args" + # attribute to be given to the sub-module. As the option + # evaluation does not have any specific attribute name, we + # provide a default one for the documentation. + # + # This is mandatory as some option declaration might use the + # "name" attribute given as argument of the submodule and use it + # as the default of option declarations. + args.name = "<name>"; + }).options; getSubModules = opts'; substSubModules = m: submodule m; functor = (defaultFunctor name) // { |