diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2024-02-28 01:43:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-28 01:43:56 +0100 |
| commit | e53c07f4cc38dcc09fb0e5883a731dd7b04250d5 (patch) | |
| tree | 7ca55eee6d4d1d842b606b3369aa186e202861ce /pkgs/os-specific | |
| parent | ba746ff713d804a782cf85f4bc8d3b37412bf66a (diff) | |
| parent | 45f1428902a6fe08ff343a7ebb7254cd1ca98785 (diff) | |
| download | nixlib-e53c07f4cc38dcc09fb0e5883a731dd7b04250d5.tar nixlib-e53c07f4cc38dcc09fb0e5883a731dd7b04250d5.tar.gz nixlib-e53c07f4cc38dcc09fb0e5883a731dd7b04250d5.tar.bz2 nixlib-e53c07f4cc38dcc09fb0e5883a731dd7b04250d5.tar.lz nixlib-e53c07f4cc38dcc09fb0e5883a731dd7b04250d5.tar.xz nixlib-e53c07f4cc38dcc09fb0e5883a731dd7b04250d5.tar.zst nixlib-e53c07f4cc38dcc09fb0e5883a731dd7b04250d5.zip | |
Merge pull request #291822 from alyssais/zfs-2.1.15
zfs_2_1: 2.1.14 -> 2.1.15
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/2_1.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix index 4642bc20f6fc..73cc0d962703 100644 --- a/pkgs/os-specific/linux/zfs/2_1.nix +++ b/pkgs/os-specific/linux/zfs/2_1.nix @@ -2,7 +2,6 @@ , kernel ? null , stdenv , linuxKernel -, removeLinuxDRM ? false , lib , nixosTests , ... @@ -16,20 +15,15 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_1"; # check the release notes for compatible kernels - kernelCompatible = - if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.6" - else kernel.kernelOlder "6.2"; + kernelCompatible = kernel.kernelOlder "6.8"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_5 - else linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7; # This is a fixed version to the 2.1.x series, move only # if the 2.1.x series moves. - version = "2.1.14"; + version = "2.1.15"; - hash = "sha256-RVAoZbV9yclGuN+D37SB6UCRFbbLEpBoyrQOQCVsQwE="; + hash = "sha256-zFO8fMbirEOrn5W57rAN7IWY6EIXG8jDXqhP7BWJyiY="; tests = [ nixosTests.zfs.series_2_1 |