pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #269097 from amarshall/zfs-221

zfs: 2.2.0 -> 2.2.1; zfsUnstable: 2.2.1-unstable-2023-10-21 -> 2.2.1

authored by Adam C. Stephens and committed by GitHub 45827faa 1ed523e0

+8 -9
unified split
+4 -4
pkgs/os-specific/linux/zfs/stable.nix
··· 18 # check the release notes for compatible kernels 19 kernelCompatible = 20 if stdenv'.isx86_64 || removeLinuxDRM 21 - then kernel.kernelOlder "6.6" 22 else kernel.kernelOlder "6.2"; 23 24 latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM 25 - then linuxKernel.packages.linux_6_5 26 else linuxKernel.packages.linux_6_1; 27 28 # this package should point to the latest release. 29 - version = "2.2.0"; 30 31 tests = [ 32 nixosTests.zfs.installer 33 nixosTests.zfs.stable 34 ]; 35 36 - hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; 37 }
··· 18 # check the release notes for compatible kernels 19 kernelCompatible = 20 if stdenv'.isx86_64 || removeLinuxDRM 21 + then kernel.kernelOlder "6.7" 22 else kernel.kernelOlder "6.2"; 23 24 latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM 25 + then linuxKernel.packages.linux_6_6 26 else linuxKernel.packages.linux_6_1; 27 28 # this package should point to the latest release. 29 + version = "2.2.1"; 30 31 tests = [ 32 nixosTests.zfs.installer 33 nixosTests.zfs.stable 34 ]; 35 36 + hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4="; 37 }
+4 -5
pkgs/os-specific/linux/zfs/unstable.nix
··· 16 kernelModuleAttribute = "zfsUnstable"; 17 # check the release notes for compatible kernels 18 kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM 19 - then kernel.kernelOlder "6.6" 20 else kernel.kernelOlder "6.2"; 21 22 latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM 23 - then linuxKernel.packages.linux_6_5 24 else linuxKernel.packages.linux_6_1; 25 26 # this package should point to a version / git revision compatible with the latest kernel release 27 # IMPORTANT: Always use a tagged release candidate or commits from the 28 # zfs-<version>-staging branch, because this is tested by the OpenZFS 29 # maintainers. 30 - version = "2.2.1-unstable-2023-10-21"; 31 - rev = "95785196f26e92d82cf4445654ba84e4a9671c57"; 32 33 - hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; 34 35 isUnstable = true; 36 tests = [
··· 16 kernelModuleAttribute = "zfsUnstable"; 17 # check the release notes for compatible kernels 18 kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM 19 + then kernel.kernelOlder "6.7" 20 else kernel.kernelOlder "6.2"; 21 22 latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM 23 + then linuxKernel.packages.linux_6_6 24 else linuxKernel.packages.linux_6_1; 25 26 # this package should point to a version / git revision compatible with the latest kernel release 27 # IMPORTANT: Always use a tagged release candidate or commits from the 28 # zfs-<version>-staging branch, because this is tested by the OpenZFS 29 # maintainers. 30 + version = "2.2.1"; 31 32 + hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4="; 33 34 isUnstable = true; 35 tests = [