eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-12-23 10:09:44 +01:00
Code Issues Releases Wiki Activity

surface: linux 6.5.7 -> 6.5.11

Browse source
This commit is contained in:
Stig Palmquist 2023-11-12 11:23:50 +01:00 committed by mergify[bot]
parent 8bb2d5ca13
commit df9bb8a436
4 changed files with 6 additions and 6 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
];
microsoft-surface.kernelVersion = mkDefault "6.5.7";
microsoft-surface.kernelVersion = mkDefault "6.5.11";
# Seems to be required to properly enable S0ix "Modern Standby":
boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];

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

@ -5,8 +5,8 @@ let
in {
imports = [
./linux-6.5.7
./linux-6.1.x
./linux-6.5.x
];
options.microsoft-surface.kernelVersion = mkOption {

8
microsoft/surface/common/kernel/linux-6.5.7/default.nix → microsoft/surface/common/kernel/linux-6.5.x/default.nix
View file

@ -8,7 +8,7 @@ let
cfg = config.microsoft-surface;
version = "6.5.7";
version = "6.5.11";
extraMeta.branch = "6.5";
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 = "135v3y2vgc83dca4xi7q52wqi4dkfal74k1y73jwzj85h12fl28d";
sha256 = "sha256-LuJK+SgrgJI7LaVrcKrX3y6O5OPwdkUuBbpmviBZtRk=";
};
};
in {
options.microsoft-surface.kernelVersion = mkOption {
type = types.enum [ "6.5.7" ];
type = types.enum [ version ];
};
config = mkIf (cfg.kernelVersion == "6.5.7") {
config = mkIf (cfg.kernelVersion == version) {
boot = {
inherit kernelPackages;
};

0
microsoft/surface/common/kernel/linux-6.5.7/patches.nix → microsoft/surface/common/kernel/linux-6.5.x/patches.nix
View file