eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-12-23 18:19:44 +01:00
Code Issues Releases Wiki Activity

microsoft/surface: Update to kernel 6.12.4

Browse source
This commit is contained in:
matthiasdotsh 2024-12-14 21:22:32 +01:00 committed by mergify[bot]
parent cf737e2eba
commit b12e314726
4 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
microsoft/surface/common/default.nix
View file

@ -8,7 +8,7 @@ in {
./kernel ./kernel
]; ];
microsoft-surface.kernelVersion = mkDefault "6.11"; microsoft-surface.kernelVersion = mkDefault "6.12";
# Seems to be required to properly enable S0ix "Modern Standby": # Seems to be required to properly enable S0ix "Modern Standby":
boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ]; boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];

4
microsoft/surface/common/kernel/linux-surface/default.nix
View file

@ -7,14 +7,14 @@ let
cfg = config.microsoft-surface; cfg = config.microsoft-surface;
version = "6.11.4"; version = "6.12.4";
kernelPatches = surfacePatches { kernelPatches = surfacePatches {
inherit version; inherit version;
patchFn = ./patches.nix; patchFn = ./patches.nix;
}; };
kernelPackages = linuxPackage { kernelPackages = linuxPackage {
inherit version kernelPatches; inherit version kernelPatches;
sha256 = "0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x"; sha256 = "sha256-bzX4IUM9hCG+cWeZB0fHxKDEUZWPuWiDRGMBrxPXEVI=";
ignoreConfigErrors=true; ignoreConfigErrors=true;
}; };

36
microsoft/surface/common/kernel/linux-surface/patches.nix
View file

@ -119,39 +119,35 @@ CONFIG_SURFACE_BOOK1_DGPU_SWITCH= module;
patch = patchSrc + "/0006-ithc.patch"; patch = patchSrc + "/0006-ithc.patch";
} }
{ {
name = "ms-surface/0007-surface-sam"; name = "ms-surface/0007-surface-sam-over-hid";
patch = patchSrc + "/0007-surface-sam.patch"; patch = patchSrc + "/0007-surface-sam-over-hid.patch";
} }
{ {
name = "ms-surface/0008-surface-sam-over-hid"; name = "ms-surface/0008-surface-button";
patch = patchSrc + "/0008-surface-sam-over-hid.patch"; patch = patchSrc + "/0008-surface-button.patch";
} }
{ {
name = "ms-surface/0009-surface-button"; name = "ms-surface/0009-surface-typecover";
patch = patchSrc + "/0009-surface-button.patch"; patch = patchSrc + "/0009-surface-typecover.patch";
} }
{ {
name = "ms-surface/0010-surface-typecover"; name = "ms-surface/0010-surface-shutdown";
patch = patchSrc + "/0010-surface-typecover.patch"; patch = patchSrc + "/0010-surface-shutdown.patch";
} }
{ {
name = "ms-surface/0011-surface-shutdown"; name = "ms-surface/0011-surface-gpe";
patch = patchSrc + "/0011-surface-shutdown.patch"; patch = patchSrc + "/0011-surface-gpe.patch";
} }
{ {
name = "ms-surface/0012-surface-gpe"; name = "ms-surface/0012-cameras";
patch = patchSrc + "/0012-surface-gpe.patch"; patch = patchSrc + "/0012-cameras.patch";
} }
{ {
name = "ms-surface/0013-cameras"; name = "ms-surface/0013-amd-gpio";
patch = patchSrc + "/0013-cameras.patch"; patch = patchSrc + "/0013-amd-gpio.patch";
} }
{ {
name = "ms-surface/0014-amd-gpio"; name = "ms-surface/0014-rtc";
patch = patchSrc + "/0014-amd-gpio.patch"; patch = patchSrc + "/0014-rtc.patch";
}
{
name = "ms-surface/0015-rtc";
patch = patchSrc + "/0015-rtc.patch";
} }
] ]

4
microsoft/surface/common/repos.nix
View file

@ -4,8 +4,8 @@
linux-surface = fetchFromGitHub { linux-surface = fetchFromGitHub {
owner = "linux-surface"; owner = "linux-surface";
repo = "linux-surface"; repo = "linux-surface";
rev = "arch-6.11.4-1"; rev = "arch-6.12.4-1";
hash = "sha256-5rKfAIkGoD5Y4nMobr7wGvzZqN2yFElXqHdcQS2VL14="; hash = "sha256-RAcM28eheOJeHU8liC2lh0zpt/SqwOsHlpWuLmncXVc=";
}; };
# This is the owner and repo for the pre-patched kernel from the "linux-surface" project: # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: