From 4e53a53767f558c5b1f260616d545371a77dd9a9 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 22 Jun 2024 09:14:17 +0300 Subject: [PATCH] linux/common-config: fix version conditionals - VMWGFX_FBCON removal was backported to 6.1 - NFSD_{V2_ACL,V3} removal was backported to 5.15 --- pkgs/os-specific/linux/kernel/common-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fbbcbdd77930..551d4cffbb92 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -439,7 +439,7 @@ let DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; - DRM_VMWGFX_FBCON = whenOlder "6.2" yes; + DRM_VMWGFX_FBCON = whenOlder "6.1" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -621,8 +621,8 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_V2_ACL = whenOlder "5.15" yes; - NFSD_V3 = whenOlder "5.15" yes; + NFSD_V2_ACL = whenOlder "5.10" yes; + NFSD_V3 = whenOlder "5.10" yes; NFSD_V3_ACL = yes; NFSD_V4 = yes; NFSD_V4_SECURITY_LABEL = yes;