Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de9f19f178c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f27950864897
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 20, 2017

  1. Fix typo about options without defaults

    @nh2
    nh2 committed May 20, 2017
    Copy the full SHA
    aed1986 View commit details

Commits on May 21, 2017

  1. Merge pull request #25934 from nh2/nixos-manual-module-option-never-fix 

    Fix typo in manual about options without defaults
    @Mic92
    Mic92 authored May 21, 2017
    Copy the full SHA
    f279508 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 nixos/doc/manual/development/option-declarations.xml
5 changes: 3 additions & 2 deletions nixos/doc/manual/development/option-declarations.xml
View file
Original file line number Diff line number Diff line change
@@ -41,8 +41,9 @@ options = {
<term><varname>default</varname></term>
<listitem>
<para>The default value used if no value is defined by any
module. A default is not required; in that case, if the option
value is never used, an error will be thrown.</para>
module. A default is not required; but if a default is not given,
then users of the module will have to define the value of the
option, otherwise an error will be thrown.</para>
</listitem>
</varlistentry>