about summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2018-01-26 13:33:49 +0000
committerGitHub <noreply@github.com>2018-01-26 13:33:49 +0000
commit1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86 (patch)
treeb9ec938eb4fe599ad5a11ec87e2080fe0a31f6ed /nixos/doc
parentc0324affe516fa83c43e4d00260f61796dc946dc (diff)
parentf646e9051d70628f5a1159c6e54e19a08da7c663 (diff)
downloadnixlib-1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86.tar
nixlib-1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86.tar.gz
nixlib-1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86.tar.bz2
nixlib-1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86.tar.lz
nixlib-1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86.tar.xz
nixlib-1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86.tar.zst
nixlib-1c2e33f3cfe0278b15629b0b22a0cf7e3cfacc86.zip
Merge pull request #34060 from WilliButz/fix-postfix-module
nixos/postfix: fix default postfix config
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-1803.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index beda33f601b3..a67d6939790d 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -149,6 +149,17 @@ following incompatible changes:</para>
       The <varname>hardware.amdHybridGraphics.disable</varname> option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The merging of config options for <varname>services.postfix.config</varname>
+      was buggy. Previously, if other options in the Postfix module like
+      <varname>services.postfix.useSrs</varname> were set and the user set config
+      options that were also set by such options, the resulting config wouldn't
+      include all options that were needed. They are now merged correctly. If
+      config options need to be overridden, <literal>lib.mkForce</literal> or
+      <literal>lib.mkOverride</literal> can be used.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>