Skip to content

Commit 99cfab0

Browse files
FRidhFRidh
committedMay 22, 2017
Merge remote-tracking branch 'upstream/master' into HEAD
2 parents b175feb + 64a924a commit 99cfab0

File tree

188 files changed

+24037
-56368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+24037
-56368
lines changed
 

‎lib/maintainers.nix

+7
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
benwbooth = "Ben Booth <benwbooth@gmail.com>";
7272
berdario = "Dario Bertini <berdario@gmail.com>";
7373
bergey = "Daniel Bergey <bergey@teallabs.org>";
74+
bhipple = "Benjamin Hipple <bhipple@protonmail.com>";
7475
bjg = "Brian Gough <bjg@gnu.org>";
7576
bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
7677
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
@@ -220,6 +221,7 @@
220221
hinton = "Tom Hinton <t@larkery.com>";
221222
hodapp = "Chris Hodapp <hodapp87@gmail.com>";
222223
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
224+
htr = "Hugo Tavares Reis <hugo@linux.com>";
223225
iand675 = "Ian Duncan <ian@iankduncan.com>";
224226
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
225227
igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
@@ -297,6 +299,7 @@
297299
lsix = "Lancelot SIX <lsix@lancelotsix.com>";
298300
lucas8 = "Luc Chabassier <luc.linux@mailoo.org>";
299301
ludo = "Ludovic Courtès <ludo@gnu.org>";
302+
lufia = "Kyohei Kadota <lufia@lufia.org>";
300303
luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
301304
lukego = "Luke Gorrie <luke@snabb.co>";
302305
lw = "Sergey Sofeychuk <lw@fmap.me>";
@@ -333,6 +336,7 @@
333336
michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
334337
michalrus = "Michal Rus <m@michalrus.com>";
335338
michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
339+
midchildan = "midchildan <midchildan+nix@gmail.com>";
336340
mikefaille = "Michaël Faille <michael@faille.io>";
337341
miltador = "Vasiliy Solovey <miltador@yandex.ua>";
338342
mimadrid = "Miguel Madrid <mimadrid@ucm.es>";
@@ -452,6 +456,7 @@
452456
rht = "rht <rhtbot@protonmail.com>";
453457
rick68 = "Wei-Ming Yang <rick68@gmail.com>";
454458
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
459+
ris = "Robert Scott <code@humanleg.org.uk>";
455460
rlupton20 = "Richard Lupton <richard.lupton@gmail.com>";
456461
rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>";
457462
rob = "Rob Vermaas <rob.vermaas@gmail.com>";
@@ -562,6 +567,7 @@
562567
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
563568
vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
564569
vmchale = "Vanessa McHale <tmchale@wisc.edu>";
570+
valeriangalliat = "Valérian Galliat <val@codejam.info>";
565571
volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>";
566572
volth = "Jaroslavas Pocepko <jaroslavas@volth.com>";
567573
vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
@@ -586,6 +592,7 @@
586592
yurrriq = "Eric Bailey <eric@ericb.me>";
587593
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
588594
zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
595+
zalakain = "Unai Zalakain <contact@unaizalakain.info>";
589596
zauberpony = "Elmar Athmer <elmar@athmer.org>";
590597
zef = "Zef Hemel <zef@zef.me>";
591598
zimbatm = "zimbatm <zimbatm@zimbatm.com>";

‎nixos/doc/manual/development/option-declarations.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ options = {
4141
<term><varname>default</varname></term>
4242
<listitem>
4343
<para>The default value used if no value is defined by any
44-
module. A default is not required; in that case, if the option
45-
value is never used, an error will be thrown.</para>
44+
module. A default is not required; but if a default is not given,
45+
then users of the module will have to define the value of the
46+
option, otherwise an error will be thrown.</para>
4647
</listitem>
4748
</varlistentry>
4849

0 commit comments

Comments
 (0)