From 9eb41407ab93fd7f2876defdf459945f24f1b54c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 14 Oct 2023 12:29:57 +0200 Subject: [PATCH] surface: linux 6.5.5 -> 6.5.7 --- microsoft/surface/common/default.nix | 2 +- microsoft/surface/common/kernel/default.nix | 2 +- .../kernel/{linux-6.5.5 => linux-6.5.7}/default.nix | 8 ++++---- .../kernel/{linux-6.5.5 => linux-6.5.7}/patches.nix | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename microsoft/surface/common/kernel/{linux-6.5.5 => linux-6.5.7}/default.nix (80%) rename microsoft/surface/common/kernel/{linux-6.5.5 => linux-6.5.7}/patches.nix (100%) diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index 29ae5dc..2aec8db 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.5.5"; + microsoft-surface.kernelVersion = mkDefault "6.5.7"; # 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 0799b46..95dce72 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -6,7 +6,7 @@ let in { imports = [ ./linux-6.1.55 - ./linux-6.5.5 + ./linux-6.5.7 ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.5.5/default.nix b/microsoft/surface/common/kernel/linux-6.5.7/default.nix similarity index 80% rename from microsoft/surface/common/kernel/linux-6.5.5/default.nix rename to microsoft/surface/common/kernel/linux-6.5.7/default.nix index 485063a..fe6825b 100644 --- a/microsoft/surface/common/kernel/linux-6.5.5/default.nix +++ b/microsoft/surface/common/kernel/linux-6.5.7/default.nix @@ -8,7 +8,7 @@ let cfg = config.microsoft-surface; - version = "6.5.5"; + version = "6.5.7"; extraMeta.branch = "6.5"; 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 = "15gg8sb6cfgk1afwj7fl7mj4nkj14w43vzwvw0qsg3nzyxwh7wcc"; + sha256 = "135v3y2vgc83dca4xi7q52wqi4dkfal74k1y73jwzj85h12fl28d"; }; }; in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.5.5" ]; + type = types.enum [ "6.5.7" ]; }; - config = mkIf (cfg.kernelVersion == "6.5.5") { + config = mkIf (cfg.kernelVersion == "6.5.7") { boot = { inherit kernelPackages; }; diff --git a/microsoft/surface/common/kernel/linux-6.5.5/patches.nix b/microsoft/surface/common/kernel/linux-6.5.7/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.5.5/patches.nix rename to microsoft/surface/common/kernel/linux-6.5.7/patches.nix