From 27ac7d57bcfe6609281c1a31a1577470bcfd5db9 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 14 Oct 2023 12:30:33 +0200 Subject: [PATCH] surface: linux 6.1.55 -> 6.1.57 --- microsoft/surface/common/kernel/default.nix | 2 +- .../kernel/{linux-6.1.55 => linux-6.1.57}/default.nix | 8 ++++---- .../kernel/{linux-6.1.55 => linux-6.1.57}/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.55 => linux-6.1.57}/default.nix (80%) rename microsoft/surface/common/kernel/{linux-6.1.55 => linux-6.1.57}/patches.nix (100%) diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix index 95dce72..93ac0e7 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -5,7 +5,7 @@ let in { imports = [ - ./linux-6.1.55 + ./linux-6.1.57 ./linux-6.5.7 ]; diff --git a/microsoft/surface/common/kernel/linux-6.1.55/default.nix b/microsoft/surface/common/kernel/linux-6.1.57/default.nix similarity index 80% rename from microsoft/surface/common/kernel/linux-6.1.55/default.nix rename to microsoft/surface/common/kernel/linux-6.1.57/default.nix index 7119a3d..76c21de 100644 --- a/microsoft/surface/common/kernel/linux-6.1.55/default.nix +++ b/microsoft/surface/common/kernel/linux-6.1.57/default.nix @@ -8,7 +8,7 @@ let cfg = config.microsoft-surface; - version = "6.1.55"; + version = "6.1.57"; 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 = "1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8"; + sha256 = "1ccidrxswblxw9yaa45y6ds16pc7647f6fz36xxxhljivhyzxszr"; }; }; in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.1.55" ]; + type = types.enum [ "6.1.57" ]; }; - config = mkIf (cfg.kernelVersion == "6.1.55") { + config = mkIf (cfg.kernelVersion == "6.1.57") { boot = { inherit kernelPackages; }; diff --git a/microsoft/surface/common/kernel/linux-6.1.55/patches.nix b/microsoft/surface/common/kernel/linux-6.1.57/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.1.55/patches.nix rename to microsoft/surface/common/kernel/linux-6.1.57/patches.nix diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix index 31f4804..efd7075 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.55"; + microsoft-surface.kernelVersion = "6.1.57"; boot.kernelParams = [ "i915.enable_rc6=1"