From 107bb46eef1f05e86fc485ee8af9b637e5157988 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 8 Aug 2024 20:16:17 +0200 Subject: [PATCH] surface: linux 6.9.12 -> 6.10.3 --- microsoft/surface/common/default.nix | 2 +- microsoft/surface/common/kernel/default.nix | 2 +- .../common/kernel/{linux-6.9.x => linux-6.10.x}/default.nix | 4 ++-- .../common/kernel/{linux-6.9.x => linux-6.10.x}/patches.nix | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename microsoft/surface/common/kernel/{linux-6.9.x => linux-6.10.x}/default.nix (87%) rename microsoft/surface/common/kernel/{linux-6.9.x => linux-6.10.x}/patches.nix (100%) diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index daf9304..f4dbfe9 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -8,7 +8,7 @@ in { ./kernel ]; - microsoft-surface.kernelVersion = mkDefault "6.9"; + microsoft-surface.kernelVersion = mkDefault "6.10"; # Seems to be required to properly enable S0ix "Modern Standby": boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ]; diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix index a8f598d..84edc89 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -5,7 +5,7 @@ let in { imports = [ - ./linux-6.9.x + ./linux-6.10.x ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.9.x/default.nix b/microsoft/surface/common/kernel/linux-6.10.x/default.nix similarity index 87% rename from microsoft/surface/common/kernel/linux-6.9.x/default.nix rename to microsoft/surface/common/kernel/linux-6.10.x/default.nix index 4006025..5d6f7a6 100644 --- a/microsoft/surface/common/kernel/linux-6.9.x/default.nix +++ b/microsoft/surface/common/kernel/linux-6.10.x/default.nix @@ -7,14 +7,14 @@ let cfg = config.microsoft-surface; - version = "6.9.12"; + version = "6.10.3"; kernelPatches = surfacePatches { inherit version; patchFn = ./patches.nix; }; kernelPackages = linuxPackage { inherit version kernelPatches; - sha256 = "08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"; + sha256 = "1666dypfg193l5460maadki4hc291hr7k9fw74nq21fxczyj4pzs"; ignoreConfigErrors=true; }; diff --git a/microsoft/surface/common/kernel/linux-6.9.x/patches.nix b/microsoft/surface/common/kernel/linux-6.10.x/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.9.x/patches.nix rename to microsoft/surface/common/kernel/linux-6.10.x/patches.nix