aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

surface: linux 6.4.16 -> 6.5.5

Browse source
This commit is contained in:
Stig Palmquist 2023-10-05 15:55:13 +02:00 committed by mergify[bot]
parent 3b14571fc9
commit afc5a2949b
4 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
microsoft/surface/common/default.nix
View file

@ -10,7 +10,7 @@ in {
./surface-control ./surface-control
]; ];
microsoft-surface.kernelVersion = mkDefault "6.4.16"; microsoft-surface.kernelVersion = mkDefault "6.5.5";
# Seems to be required to properly enable S0ix "Modern Standby": # Seems to be required to properly enable S0ix "Modern Standby":
boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ]; boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];

2
microsoft/surface/common/kernel/default.nix
View file

@ -5,8 +5,8 @@ let
in { in {
imports = [ imports = [
./linux-6.4.16
./linux-6.1.55 ./linux-6.1.55
./linux-6.5.5
]; ];
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {

10
microsoft/surface/common/kernel/linux-6.4.16/default.nix → microsoft/surface/common/kernel/linux-6.5.5/default.nix
View file

@ -8,8 +8,8 @@ let
cfg = config.microsoft-surface; cfg = config.microsoft-surface;
version = "6.4.16"; version = "6.5.5";
extraMeta.branch = "6.4"; extraMeta.branch = "6.5";
patchDir = repos.linux-surface + "/patches/${extraMeta.branch}"; patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
kernelPatches = pkgs.callPackage ./patches.nix { kernelPatches = pkgs.callPackage ./patches.nix {
inherit (lib) kernel; inherit (lib) kernel;
@ -20,17 +20,17 @@ let
inherit version extraMeta kernelPatches; inherit version extraMeta kernelPatches;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln"; sha256 = "15gg8sb6cfgk1afwj7fl7mj4nkj14w43vzwvw0qsg3nzyxwh7wcc";
}; };
}; };
in { in {
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {
type = types.enum [ "6.4.16" ]; type = types.enum [ "6.5.5" ];
}; };
config = mkIf (cfg.kernelVersion == "6.4.16") { config = mkIf (cfg.kernelVersion == "6.5.5") {
boot = { boot = {
inherit kernelPackages; inherit kernelPackages;
}; };

36
microsoft/surface/common/kernel/linux-6.4.16/patches.nix → microsoft/surface/common/kernel/linux-6.5.5/patches.nix
View file

@ -104,35 +104,39 @@
patch = patchDir + "/0005-ithc.patch"; patch = patchDir + "/0005-ithc.patch";
} }
{ {
name = "ms-surface/0006-surface-sam-over-hid"; name = "ms-surface/0006-surface-sam";
patch = patchDir + "/0006-surface-sam-over-hid.patch"; patch = patchDir + "/0006-surface-sam.patch";
} }
{ {
name = "ms-surface/0007-surface-button"; name = "ms-surface/0007-surface-sam-over-hid";
patch = patchDir + "/0007-surface-button.patch"; patch = patchDir + "/0007-surface-sam-over-hid.patch";
} }
{ {
name = "ms-surface/0008-surface-typecover"; name = "ms-surface/0008-surface-button";
patch = patchDir + "/0008-surface-typecover.patch"; patch = patchDir + "/0008-surface-button.patch";
} }
{ {
name = "ms-surface/0009-surface-shutdown"; name = "ms-surface/0009-surface-typecover";
patch = patchDir + "/0009-surface-shutdown.patch"; patch = patchDir + "/0009-surface-typecover.patch";
} }
{ {
name = "ms-surface/0010-surface-gpe"; name = "ms-surface/0010-surface-shutdown";
patch = patchDir + "/0010-surface-gpe.patch"; patch = patchDir + "/0010-surface-shutdown.patch";
} }
{ {
name = "ms-surface/0011-cameras"; name = "ms-surface/0011-surface-gpe";
patch = patchDir + "/0011-cameras.patch"; patch = patchDir + "/0011-surface-gpe.patch";
} }
{ {
name = "ms-surface/0012-amd-gpio"; name = "ms-surface/0012-cameras";
patch = patchDir + "/0012-amd-gpio.patch"; patch = patchDir + "/0012-cameras.patch";
} }
{ {
name = "ms-surface/0013-rtc"; name = "ms-surface/0013-amd-gpio";
patch = patchDir + "/0013-rtc.patch"; patch = patchDir + "/0013-amd-gpio.patch";
}
{
name = "ms-surface/0014-rtc";
patch = patchDir + "/0014-rtc.patch";
} }
] ]