From 93b55ffb0064f2cdcdf5bab034f17f8848d0626d Mon Sep 17 00:00:00 2001 From: Madoura Date: Fri, 24 Jun 2022 03:03:37 -0500 Subject: [PATCH] release-notes: move zfs update from 22.11 to 22.05 --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 6 ++++++ nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 ------ nixos/doc/manual/release-notes/rl-2205.section.md | 4 +++- nixos/doc/manual/release-notes/rl-2211.section.md | 2 -- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 5208671e4dab..678c73bcb412 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -2776,6 +2776,12 @@ sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb runs a PostgreSQL server for the duration of package checks. + + + zfs was updated from 2.1.4 to 2.1.5, + enabling it to be used with Linux kernel 5.18. + + stdenv.mkDerivation now supports a 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 8b1e402fc6f4..c62efadbbf1a 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 @@ -262,12 +262,6 @@ and require manual remediation. - - - zfs was updated from 2.1.4 to 2.1.5, - enabling it to be used with Linux kernel 5.18. - - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index faf941f56996..9c2f9bcff572 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -971,7 +971,9 @@ In addition to numerous new and upgraded packages, this release has the followin was changed. - The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks. - + +- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18. + - `stdenv.mkDerivation` now supports a self-referencing `finalAttrs:` parameter containing the final `mkDerivation` arguments including overrides. `drv.overrideAttrs` now supports two parameters `finalAttrs: previousAttrs:`. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index c2626998843b..f6366c14cf48 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -102,8 +102,6 @@ Use `configure.packages` instead. - Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. -- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18. - - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.