surface: linux 6.4.12 -> 6.4.14
This commit is contained in:
parent
88348cb5c1
commit
4cd9ced7fa
|
@ -10,7 +10,7 @@ in {
|
||||||
./surface-control
|
./surface-control
|
||||||
];
|
];
|
||||||
|
|
||||||
microsoft-surface.kernelVersion = mkDefault "6.4.12";
|
microsoft-surface.kernelVersion = mkDefault "6.4.14";
|
||||||
|
|
||||||
# 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" ];
|
||||||
|
|
|
@ -8,7 +8,7 @@ in {
|
||||||
./linux-5.19.17
|
./linux-5.19.17
|
||||||
./linux-6.0.17
|
./linux-6.0.17
|
||||||
./linux-6.1.18
|
./linux-6.1.18
|
||||||
./linux-6.4.12
|
./linux-6.4.14
|
||||||
];
|
];
|
||||||
|
|
||||||
options.microsoft-surface.kernelVersion = mkOption {
|
options.microsoft-surface.kernelVersion = mkOption {
|
||||||
|
|
|
@ -8,7 +8,7 @@ let
|
||||||
|
|
||||||
cfg = config.microsoft-surface;
|
cfg = config.microsoft-surface;
|
||||||
|
|
||||||
version = "6.4.12";
|
version = "6.4.14";
|
||||||
extraMeta.branch = "6.4";
|
extraMeta.branch = "6.4";
|
||||||
patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
|
patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
|
||||||
kernelPatches = pkgs.callPackage ./patches.nix {
|
kernelPatches = pkgs.callPackage ./patches.nix {
|
||||||
|
@ -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 = "0x56b4hslm730ghvggz41fjkbzlnxp6k8857dn7iy27yavlipafc";
|
sha256 = "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
options.microsoft-surface.kernelVersion = mkOption {
|
options.microsoft-surface.kernelVersion = mkOption {
|
||||||
type = types.enum [ "6.4.12" ];
|
type = types.enum [ "6.4.14" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf (cfg.kernelVersion == "6.4.12") {
|
config = mkIf (cfg.kernelVersion == "6.4.14") {
|
||||||
boot = {
|
boot = {
|
||||||
inherit kernelPackages;
|
inherit kernelPackages;
|
||||||
};
|
};
|
Loading…
Reference in a new issue