Merge staging-next into staging

2021-05-01 00:54:32 +00:00
parent f130655d5e d354a83dfe
commit ef6416a6ba
42 changed files with 1745 additions and 1259 deletions
@@ -703,6 +703,12 @@ environment.systemPackages = [
       <literal>skip-kernel-setup true</literal> and takes care of setting forwarding and rp_filter sysctls by itself as well
       as for each interface in <varname>services.babeld.interfaces</varname>.
     </para>
+    </listitem>
+   <listitem>
+     <para>
+      The <option>services.zigbee2mqtt.config</option> option has been renamed to <option>services.zigbee2mqtt.settings</option> and
+      now follows <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC 0042</link>.
+     </para>
   </listitem>
  </itemizedlist>
 </section>