diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix index 2952dae..1c0e628 100644 --- a/microsoft/surface/default.nix +++ b/microsoft/surface/default.nix @@ -9,7 +9,7 @@ in { ./firmware/surface-go/ath10k ]; - microsoft-surface.kernelVersion = mkDefault "6.0.11"; + microsoft-surface.kernelVersion = mkDefault "6.0.17"; boot.extraModprobeConfig = mkDefault '' options i915 enable_fbc=1 enable_rc6=1 modeset=1 diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix index f44bf60..dbaa678 100644 --- a/microsoft/surface/kernel/default.nix +++ b/microsoft/surface/kernel/default.nix @@ -6,7 +6,7 @@ let in { imports = [ ./linux-5.19.17 - ./linux-6.0.11 + ./linux-6.0.17 ./linux-6.1.3 ]; diff --git a/microsoft/surface/kernel/linux-6.0.11/default.nix b/microsoft/surface/kernel/linux-6.0.17/default.nix similarity index 80% rename from microsoft/surface/kernel/linux-6.0.11/default.nix rename to microsoft/surface/kernel/linux-6.0.17/default.nix index 652f241..5196065 100644 --- a/microsoft/surface/kernel/linux-6.0.11/default.nix +++ b/microsoft/surface/kernel/linux-6.0.17/default.nix @@ -8,7 +8,7 @@ let cfg = config.microsoft-surface; - version = "6.0.11"; + version = "6.0.17"; extraMeta.branch = "6.0"; patchDir = repos.linux-surface + "/patches/${extraMeta.branch}"; kernelPatches = pkgs.callPackage ./patches.nix { @@ -20,17 +20,17 @@ let inherit version extraMeta kernelPatches; src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "sha256-K65hMeZJceHjT/OV+lQpcRNMhXvbCykGmrhHx8mpx2I="; + sha256 = "sha256-p+6SCSpUWbtGq/C1RJpOV+i3klkaxOesBO0lQtLOHQg="; }; }; in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.0.11" ]; + type = types.enum [ "6.0.17" ]; }; - config = mkIf (cfg.kernelVersion == "6.0.11") { + config = mkIf (cfg.kernelVersion == "6.0.17") { boot = { inherit kernelPackages; }; diff --git a/microsoft/surface/kernel/linux-6.0.11/patches.nix b/microsoft/surface/kernel/linux-6.0.17/patches.nix similarity index 94% rename from microsoft/surface/kernel/linux-6.0.11/patches.nix rename to microsoft/surface/kernel/linux-6.0.17/patches.nix index e111c26..7b0d096 100644 --- a/microsoft/surface/kernel/linux-6.0.11/patches.nix +++ b/microsoft/surface/kernel/linux-6.0.17/patches.nix @@ -111,8 +111,12 @@ name = "ms-surface/0009-cameras"; patch = patchDir + "/0009-cameras.patch"; } - # { - # name = "ms-surface/0010-amd-gpio"; - # patch = patchDir + "/0010-amd-gpio.patch"; - # } + { + name = "ms-surface/0010-amd-gpio"; + patch = patchDir + "/0010-amd-gpio.patch"; + } + { + name = "ms-surface/0011-rtc"; + patch = patchDir + "/0011-rtc.patch"; + } ]