diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix index 93ac0e7..a209460 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -5,8 +5,8 @@ let in { imports = [ - ./linux-6.1.57 ./linux-6.5.7 + ./linux-6.1.x ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.1.57/default.nix b/microsoft/surface/common/kernel/linux-6.1.x/default.nix similarity index 80% rename from microsoft/surface/common/kernel/linux-6.1.57/default.nix rename to microsoft/surface/common/kernel/linux-6.1.x/default.nix index 76c21de..05ec4cf 100644 --- a/microsoft/surface/common/kernel/linux-6.1.57/default.nix +++ b/microsoft/surface/common/kernel/linux-6.1.x/default.nix @@ -8,7 +8,7 @@ let cfg = config.microsoft-surface; - version = "6.1.57"; + version = "6.1.62"; 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 = "1ccidrxswblxw9yaa45y6ds16pc7647f6fz36xxxhljivhyzxszr"; + sha256 = "sha256-uf1hb6zWvs/O74i5vnGNDxZiXKs/6B0ROEgCpwkehew="; }; }; in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.1.57" ]; + type = types.enum [ version ]; }; - config = mkIf (cfg.kernelVersion == "6.1.57") { + config = mkIf (cfg.kernelVersion == version ) { boot = { inherit kernelPackages; }; diff --git a/microsoft/surface/common/kernel/linux-6.1.57/patches.nix b/microsoft/surface/common/kernel/linux-6.1.x/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.1.57/patches.nix rename to microsoft/surface/common/kernel/linux-6.1.x/patches.nix diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix index efd7075..a1073dd 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.57"; + microsoft-surface.kernelVersion = "6.1.62"; boot.kernelParams = [ "i915.enable_rc6=1"