diff options
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/configuration.xml | 16 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes.xml | 39 |
2 files changed, 47 insertions, 8 deletions
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 307719d2cd2e..246ab11587a8 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -443,8 +443,20 @@ Note that both <filename>configuration.nix</filename> and define an option, NixOS will try to <emphasis>merge</emphasis> the definitions. In the case of <option>environment.systemPackages</option>, that’s easy: the lists of -packages can simply be concatenated. For other types of options, a -merge may not be possible: for instance, if two modules define +packages can simply be concatenated. The value in +<filename>configuration.nix</filename> is merged last, so for +list-type options, it will appear at the end of the merged list. If +you want it to appear first, you can use <varname>mkBefore</varname>: + +<programlisting> +boot.kernelModules = mkBefore [ "kvm-intel" ]; +</programlisting> + +This causes the <literal>kvm-intel</literal> kernel module to be +loaded before any other kernel modules.</para> + +<para>For other types of options, a merge may not be possible. For +instance, if two modules define <option>services.httpd.adminAddr</option>, <command>nixos-rebuild</command> will give an error: diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml index 8899cbb21498..10815ba613ad 100644 --- a/nixos/doc/manual/release-notes.xml +++ b/nixos/doc/manual/release-notes.xml @@ -7,7 +7,7 @@ <section xml:id="sec-release-14.02"> -<title>Release 14.02 (“Baboon”, 2014/02/??)</title> +<title>Release 14.04 (“Baboon”, 2014/04/??)</title> <para>This is the second stable release branch of NixOS. The main enhancements are the following: @@ -18,13 +18,9 @@ enhancements are the following: <xref linkend="sec-uefi-installation"/> for details.</para></listitem> - <listitem><para>NixOS is now based on Glibc 2.18 and GCC + <listitem><para>NixOS is now based on Glibc 2.19 and GCC 4.8.</para></listitem> - <listitem><para>The mysql55 service has been merged into the - mysql service, which no longer sets a default for the 'package - option.</para></listitem> - </itemizedlist> </para> @@ -34,10 +30,41 @@ following incompatible changes: <itemizedlist> + <listitem><para>Nixpkgs no longer exposes unfree packages by + default. If your NixOS configuration requires unfree packages from + Nixpkgs, you need to enable support for them explicitly by setting: + +<programlisting> +nixpkgs.config.allowUnfree = true; +</programlisting> + + Otherwise, you get an error message such as: + +<screen> +error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:56’ + has an unfree license, refusing to evaluate +</screen> + + </para></listitem> + + <listitem><para>The firewall is now enabled by default. If you don’t + want this, you need to disable it explicitly: + +<programlisting> +networking.firewall.enable = false; +</programlisting> + + </para></listitem> + <listitem><para>The option <option>boot.loader.grub.memtest86</option> has been renamed to <option>boot.loader.grub.memtest86.enable</option>.</para></listitem> + <listitem><para>The <literal>mysql55</literal> service has been + merged into the <literal>mysql</literal> service, which no longer + sets a default for the option + <option>services.mysql.package</option>.</para></listitem> + </itemizedlist> </para> |