From 455453f48d9ce7e09c69d722081691550d3d79ed Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 17 Sep 2023 16:30:06 +0200 Subject: [PATCH] surface: linux 6.1.18 -> 6.1.53 --- microsoft/surface/common/kernel/default.nix | 2 +- .../kernel/{linux-6.1.18 => linux-6.1.53}/default.nix | 8 ++++---- .../kernel/{linux-6.1.18 => linux-6.1.53}/patches.nix | 0 microsoft/surface/surface-go/default.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename microsoft/surface/common/kernel/{linux-6.1.18 => linux-6.1.53}/default.nix (80%) rename microsoft/surface/common/kernel/{linux-6.1.18 => linux-6.1.53}/patches.nix (100%) diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix index 5f3a9a5..e592e44 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -7,7 +7,7 @@ in { imports = [ ./linux-5.19.17 ./linux-6.0.17 - ./linux-6.1.18 + ./linux-6.1.53 ./linux-6.4.16 ]; diff --git a/microsoft/surface/common/kernel/linux-6.1.18/default.nix b/microsoft/surface/common/kernel/linux-6.1.53/default.nix similarity index 80% rename from microsoft/surface/common/kernel/linux-6.1.18/default.nix rename to microsoft/surface/common/kernel/linux-6.1.53/default.nix index cbf228d..4df03fa 100644 --- a/microsoft/surface/common/kernel/linux-6.1.18/default.nix +++ b/microsoft/surface/common/kernel/linux-6.1.53/default.nix @@ -8,7 +8,7 @@ let cfg = config.microsoft-surface; - version = "6.1.18"; + version = "6.1.53"; extraMeta.branch = "6.1"; 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-hCrBXv8Ob7DBUP34P09qr2tMEjnc+MFOIidiDsCuFB4="; + sha256 = "0zpdg3fcc12iyjhfs5w7cw75700z4i8m9jcg38mlzlhh92hf0msz"; }; }; in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.1.18" ]; + type = types.enum [ "6.1.53" ]; }; - config = mkIf (cfg.kernelVersion == "6.1.18") { + config = mkIf (cfg.kernelVersion == "6.1.53") { boot = { inherit kernelPackages; }; diff --git a/microsoft/surface/common/kernel/linux-6.1.18/patches.nix b/microsoft/surface/common/kernel/linux-6.1.53/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.1.18/patches.nix rename to microsoft/surface/common/kernel/linux-6.1.53/patches.nix diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix index b4f990e..361a83c 100644 --- a/microsoft/surface/surface-go/default.nix +++ b/microsoft/surface/surface-go/default.nix @@ -17,7 +17,7 @@ in { ../../../common/cpu/intel/kaby-lake ]; - microsoft-surface.kernelVersion = "6.1.18"; + microsoft-surface.kernelVersion = "6.1.53"; boot.kernelParams = [ "i915.enable_rc6=1"