From 8cfcee74b1678205aa82af92f2daeec293d50ced Mon Sep 17 00:00:00 2001 From: Madoura Date: Wed, 22 Jun 2022 15:30:16 -0500 Subject: [PATCH] zfs: 2.1.4 -> 2.1.5 --- .../from_md/release-notes/rl-2211.section.xml | 6 ++++++ .../manual/release-notes/rl-2211.section.md | 2 ++ pkgs/os-specific/linux/zfs/default.nix | 18 +++++++++--------- 3 files changed, 17 insertions(+), 9 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 c62efadbbf1a..8b1e402fc6f4 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,6 +262,12 @@ 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-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index f6366c14cf48..c2626998843b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -102,6 +102,8 @@ 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. diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 96c6f57b019a..eec2d1ad04ab 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18 }: let @@ -216,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to the latest release. - version = "2.1.4"; + version = "2.1.5"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.4"; + version = "2.1.5"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; isUnstable = true; };