diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-26 12:12:27 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-26 12:27:10 +0100 |
| commit | 2b9f0438230377995efb9a6efeec5f8572967643 (patch) | |
| tree | 2157f26040328e00a3276e15026198dfb3f7338a /pkgs/os-specific | |
| parent | fcea2b6260dd566c28c894b4207a5f2b56c2cba3 (diff) | |
| download | nixlib-2b9f0438230377995efb9a6efeec5f8572967643.tar nixlib-2b9f0438230377995efb9a6efeec5f8572967643.tar.gz nixlib-2b9f0438230377995efb9a6efeec5f8572967643.tar.bz2 nixlib-2b9f0438230377995efb9a6efeec5f8572967643.tar.lz nixlib-2b9f0438230377995efb9a6efeec5f8572967643.tar.xz nixlib-2b9f0438230377995efb9a6efeec5f8572967643.tar.zst nixlib-2b9f0438230377995efb9a6efeec5f8572967643.zip | |
zfs: update latestCompatibleLinuxPackages
ZFS no longer tries to use GPL-only symbols on aarch64. Tested by building nixosTests.zfs.stable (modified to use Linux 6.6) and nixosTests.zfs.unstable.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/stable.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/unstable.nix | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index df06ea9a3285..7ca1d5be3787 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -2,7 +2,6 @@ , kernel ? null , stdenv , linuxKernel -, removeLinuxDRM ? false , nixosTests , ... } @ args: @@ -15,14 +14,9 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs"; # check the release notes for compatible kernels - kernelCompatible = - if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.8" - else kernel.kernelOlder "6.2"; + kernelCompatible = kernel.kernelOlder "6.8"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_7 - else linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7; # this package should point to the latest release. version = "2.2.3"; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 64a1e7955000..2bd06e0d6b74 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -2,7 +2,6 @@ , kernel ? null , stdenv , linuxKernel -, removeLinuxDRM ? false , nixosTests , ... } @ args: @@ -15,14 +14,9 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfsUnstable"; # check the release notes for compatible kernels - kernelCompatible = - if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.9" - else kernel.kernelOlder "6.2"; + kernelCompatible = kernel.kernelOlder "6.9"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_7 - else linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7; # 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 |