diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-10 12:01:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 12:01:27 +0000 |
| commit | f3a93620b183a16fbfdba1675a717f3c74b12328 (patch) | |
| tree | 2d76a246a534925f6200556fcfd4b8c5a7eba5f6 /nixos/doc/manual | |
| parent | 113bfd75d6d64d25981e630babe2ca36233744c8 (diff) | |
| parent | b73781c9893215ff33a7a372976a45ba8528086c (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 18 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 186602cae925d..8abc9640daa51 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1367,10 +1367,20 @@ signald -d /var/lib/signald/db \ </listitem> <listitem> <para> - boot.kernel.sysctl is defined as a freeformType and adds a - custom merge option for <quote>net.core.rmem_max</quote> - (taking the highest value defined to avoid conflicts between 2 - services trying to set that value) + <literal>boot.kernel.sysctl</literal> is defined as a + freeformType and adds a custom merge option for + <quote>net.core.rmem_max</quote> (taking the highest value + defined to avoid conflicts between 2 services trying to set + that value). + </para> + </listitem> + <listitem> + <para> + The <literal>mame</literal> package does not ship with its + tools anymore in the default output. They were moved to a + separate <literal>tools</literal> output instead. For + convenience, <literal>mame-tools</literal> package was added + for those who want to use it. </para> </listitem> </itemizedlist> diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 3e9e3d8f8e1ab..c1e257c521aab 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -414,6 +414,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `nodePackages` package set now defaults to the LTS release in the `nodejs` package again, instead of being pinned to `nodejs-14_x`. Several updates to node2nix have been made for compatibility with newer Node.js and npm versions and a new `postRebuild` hook has been added for packages to perform extra build steps before the npm install step prunes dev dependencies. -- boot.kernel.sysctl is defined as a freeformType and adds a custom merge option for "net.core.rmem_max" (taking the highest value defined to avoid conflicts between 2 services trying to set that value) +- `boot.kernel.sysctl` is defined as a freeformType and adds a custom merge option for "net.core.rmem_max" (taking the highest value defined to avoid conflicts between 2 services trying to set that value). + +- The `mame` package does not ship with its tools anymore in the default output. They were moved to a separate `tools` output instead. For convenience, `mame-tools` package was added for those who want to use it. <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> |