diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-27 06:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-27 06:01:24 +0000 |
| commit | a5a29bafa636e66f31b53fcbb6aaf319ab3cb371 (patch) | |
| tree | d71a3ec2d5c6f73ec18d1eef466b54fccb2d3af0 /nixos | |
| parent | 7dcecd7387ec772de3aea48455264adffd10d2c9 (diff) | |
| parent | 6e15868fd642bff0e6b6fa40af3ab1c7bc1cd1d4 (diff) | |
| download | nixlib-a5a29bafa636e66f31b53fcbb6aaf319ab3cb371.tar nixlib-a5a29bafa636e66f31b53fcbb6aaf319ab3cb371.tar.gz nixlib-a5a29bafa636e66f31b53fcbb6aaf319ab3cb371.tar.bz2 nixlib-a5a29bafa636e66f31b53fcbb6aaf319ab3cb371.tar.lz nixlib-a5a29bafa636e66f31b53fcbb6aaf319ab3cb371.tar.xz nixlib-a5a29bafa636e66f31b53fcbb6aaf319ab3cb371.tar.zst nixlib-a5a29bafa636e66f31b53fcbb6aaf319ab3cb371.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -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 98df6a40e8a1..c6a153cfcb2d 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"; |