From 365cc96597f674e9c1c70eb08fc84f0d2f9b25b3 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 21 Nov 2023 20:27:03 -0500 Subject: zfs: 2.2.0 -> 2.2.1 Now supports Kernel 6.6. --- pkgs/os-specific/linux/zfs/stable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index ab71d2ecb8e16..98eb8581b637a 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -18,20 +18,20 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.6" + then kernel.kernelOlder "6.7" else kernel.kernelOlder "6.2"; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_5 + then linuxKernel.packages.linux_6_6 else linuxKernel.packages.linux_6_1; # this package should point to the latest release. - version = "2.2.0"; + version = "2.2.1"; tests = [ nixosTests.zfs.installer nixosTests.zfs.stable ]; - hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; + hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4="; } -- cgit 1.4.1 From 55b737831baa6080203ec490a8bfe5f9df420ae0 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 22 Nov 2023 09:23:11 +0100 Subject: zfsUnstable: 2.2.1-unstable-2023-10-21 -> 2.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Thalheim --- pkgs/os-specific/linux/zfs/unstable.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index cce2d69efa3bb..3347f58500ef0 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -16,21 +16,20 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfsUnstable"; # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.6" + then kernel.kernelOlder "6.7" else kernel.kernelOlder "6.2"; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_5 + then linuxKernel.packages.linux_6_6 else linuxKernel.packages.linux_6_1; # 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.2.1-unstable-2023-10-21"; - rev = "95785196f26e92d82cf4445654ba84e4a9671c57"; + version = "2.2.1"; - hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; + hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4="; isUnstable = true; tests = [ -- cgit 1.4.1