diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index 37db0c8..eceba75 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -10,7 +10,7 @@ in { ./surface-control ]; - microsoft-surface.kernelVersion = mkDefault "6.4.12"; + microsoft-surface.kernelVersion = mkDefault "6.4.14"; # 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 934dfdf..c625815 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -8,7 +8,7 @@ in { ./linux-5.19.17 ./linux-6.0.17 ./linux-6.1.18 - ./linux-6.4.12 + ./linux-6.4.14 ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.4.12/default.nix b/microsoft/surface/common/kernel/linux-6.4.14/default.nix similarity index 80% rename from microsoft/surface/common/kernel/linux-6.4.12/default.nix rename to microsoft/surface/common/kernel/linux-6.4.14/default.nix index e99c5d4..ae75c94 100644 --- a/microsoft/surface/common/kernel/linux-6.4.12/default.nix +++ b/microsoft/surface/common/kernel/linux-6.4.14/default.nix @@ -8,7 +8,7 @@ let cfg = config.microsoft-surface; - version = "6.4.12"; + version = "6.4.14"; extraMeta.branch = "6.4"; 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 = "0x56b4hslm730ghvggz41fjkbzlnxp6k8857dn7iy27yavlipafc"; + sha256 = "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm"; }; }; in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.4.12" ]; + type = types.enum [ "6.4.14" ]; }; - config = mkIf (cfg.kernelVersion == "6.4.12") { + config = mkIf (cfg.kernelVersion == "6.4.14") { boot = { inherit kernelPackages; }; diff --git a/microsoft/surface/common/kernel/linux-6.4.12/patches.nix b/microsoft/surface/common/kernel/linux-6.4.14/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.4.12/patches.nix rename to microsoft/surface/common/kernel/linux-6.4.14/patches.nix