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 /nixos/modules/tasks | |
parent | fcea2b6260dd566c28c894b4207a5f2b56c2cba3 (diff) |
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 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 98df6a40e8a1b..c6a153cfcb2d7 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -588,7 +588,9 @@ in kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ]; extraModulePackages = [ - (cfgZfs.modulePackage.override { inherit (cfgZfs) removeLinuxDRM; }) + (cfgZfs.modulePackage.override + (lib.optionalAttrs (lib.versionOlder cfgZfs.package.version "2.2.3") + { inherit (cfgZfs) removeLinuxDRM; })) ]; }; @@ -731,7 +733,7 @@ in # this symbol. # In the meantime, we restore what was once a working piece of code # in the kernel. - boot.kernelPatches = lib.optional (cfgZfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") { + boot.kernelPatches = lib.optional (lib.versionOlder cfgZfs.package.version "2.2.3" && cfgZfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") { name = "export-neon-symbols-as-gpl"; patch = pkgs.fetchpatch { url = "https://github.com/torvalds/linux/commit/aaeca98456431a8d9382ecf48ac4843e252c07b3.patch"; |