Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

linux_testing: 6.17-rc7 -> 6.18-rc1 (#451595)

Browse Source
This commit is contained in:
K900
2025-10-13 21:44:33 +03:00
committed by GitHub
parent 09b320cfbf e9b977bc41
commit 57ed617a10
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -550,7 +550,7 @@ let
DRM_AMD_ISP = whenAtLeast "6.11" yes; DRM_AMD_ISP = whenAtLeast "6.11" yes;
# Enable new firmware (and by extension NVK) for compatible hardware on Nouveau # Enable new firmware (and by extension NVK) for compatible hardware on Nouveau
DRM_NOUVEAU_GSP_DEFAULT = whenAtLeast "6.8" yes; DRM_NOUVEAU_GSP_DEFAULT = whenBetween "6.8" "6.18" yes;
# Enable Nouveau shared virtual memory (used by OpenCL) # Enable Nouveau shared virtual memory (used by OpenCL)
DEVICE_PRIVATE = whenHasDevicePrivate yes; DEVICE_PRIVATE = whenHasDevicePrivate yes;
@@ -568,6 +568,11 @@ let
# Intel GVT-g graphics virtualization supports 64-bit only # Intel GVT-g graphics virtualization supports 64-bit only
DRM_I915_GVT = yes; DRM_I915_GVT = yes;
DRM_I915_GVT_KVMGT = module; DRM_I915_GVT_KVMGT = module;
# Enable Hyper-V guest stuff
HYPERV = lib.mkMerge [
(whenOlder "6.18" module)
(whenAtLeast "6.18" yes)
];
# Enable Hyper-V Synthetic DRM Driver # Enable Hyper-V Synthetic DRM Driver
DRM_HYPERV = whenAtLeast "5.14" module; DRM_HYPERV = whenAtLeast "5.14" module;
# And disable the legacy framebuffer driver when we have the new one # And disable the legacy framebuffer driver when we have the new one
@@ -683,8 +688,8 @@ let
EXT2_FS_POSIX_ACL = yes; EXT2_FS_POSIX_ACL = yes;
EXT2_FS_SECURITY = yes; EXT2_FS_SECURITY = yes;
EXT3_FS_POSIX_ACL = yes; EXT3_FS_POSIX_ACL = option yes;
EXT3_FS_SECURITY = yes; EXT3_FS_SECURITY = option yes;
EXT4_FS_POSIX_ACL = yes; EXT4_FS_POSIX_ACL = yes;
EXT4_FS_SECURITY = yes; EXT4_FS_SECURITY = yes;
@@ -1020,7 +1025,7 @@ let
ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes; ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes;
ZSWAP = option yes; ZSWAP = option yes;
ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (lib.mkOptionDefault yes); ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (lib.mkOptionDefault yes);
ZPOOL = yes; ZPOOL = whenOlder "6.18" yes;
ZSMALLOC = option yes; ZSMALLOC = option yes;
}; };
@@ -1085,6 +1090,8 @@ let
HID_BATTERY_STRENGTH = yes; HID_BATTERY_STRENGTH = yes;
# enabled by default in x86_64 but not arm64, so we do that here # enabled by default in x86_64 but not arm64, so we do that here
HIDRAW = yes; HIDRAW = yes;
# 6.18-rc1 fails to link otherwise, at least on aarch64
HID_HAPTIC = whenAtLeast "6.18" yes;
# Enable loading HID fixups as eBPF from userspace # Enable loading HID fixups as eBPF from userspace
HID_BPF = whenAtLeast "6.3" (whenPlatformHasEBPFJit yes); HID_BPF = whenAtLeast "6.3" (whenPlatformHasEBPFJit yes);

4
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -1,7 +1,7 @@
{ {
"testing": { "testing": {
"version": "6.17-rc7", "version": "6.18-rc1",
"hash": "sha256:11bjz14ncfbnz3h9a4vk71av664xrx1kh28i22w7yg6g46hifq65", "hash": "sha256:1warfcvr86as1rcls3g5f9i4az6xqabjwmf6jxlx9dk2l523sl1l",
"lts": false "lts": false
}, },
"6.1": { "6.1": {