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

surface: linux 6.5.11 -> 6.6.6

Browse source 
- linux-surface: arch-6.6.1-1 -> arch-6.6.4-1
- update config for 6.6
This commit is contained in:
Stig Palmquist 2023-12-11 03:48:13 +01:00 committed by mergify[bot]
parent 030edbb68e
commit fef05bf9c8
5 changed files with 8 additions and 8 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.5.11"; microsoft-surface.kernelVersion = mkDefault "6.6.6";
# 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

@ -6,7 +6,7 @@ let
in { in {
imports = [ imports = [
./linux-6.1.x ./linux-6.1.x
./linux-6.5.x ./linux-6.6.x
]; ];
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {

6
microsoft/surface/common/kernel/linux-6.5.x/default.nix → microsoft/surface/common/kernel/linux-6.6.x/default.nix
View file

@ -8,8 +8,8 @@ let
cfg = config.microsoft-surface; cfg = config.microsoft-surface;
version = "6.5.11"; version = "6.6.6";
majorVersion = "6.5"; majorVersion = "6.6";
patchDir = repos.linux-surface + "/patches/${majorVersion}"; patchDir = repos.linux-surface + "/patches/${majorVersion}";
kernelPatches = pkgs.callPackage ./patches.nix { kernelPatches = pkgs.callPackage ./patches.nix {
inherit (lib) kernel; inherit (lib) kernel;
@ -21,7 +21,7 @@ let
extraMeta.branch = majorVersion; extraMeta.branch = majorVersion;
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 = "sha256-LuJK+SgrgJI7LaVrcKrX3y6O5OPwdkUuBbpmviBZtRk="; sha256 = "sha256-6/cKkXk0sTFp4b5blcO2wv6lvBTm3BRPHvuKABayJMg=";
}; };
}; };

2
microsoft/surface/common/kernel/linux-6.5.x/patches.nix → microsoft/surface/common/kernel/linux-6.6.x/patches.nix
View file

@ -55,7 +55,7 @@
VIDEO_DW9719 = module; VIDEO_DW9719 = module;
VIDEO_IPU3_IMGU = module; VIDEO_IPU3_IMGU = module;
VIDEO_IPU3_CIO2 = module; VIDEO_IPU3_CIO2 = module;
CIO2_BRIDGE = yes; IPU_BRIDGE = module;
INTEL_SKL_INT3472 = module; INTEL_SKL_INT3472 = module;
REGULATOR_TPS68470 = module; REGULATOR_TPS68470 = module;
COMMON_CLK_TPS68470 = module; COMMON_CLK_TPS68470 = module;

4
microsoft/surface/common/repos.nix
View file

@ -4,8 +4,8 @@
linux-surface = fetchFromGitHub { linux-surface = fetchFromGitHub {
owner = "linux-surface"; owner = "linux-surface";
repo = "linux-surface"; repo = "linux-surface";
rev = "arch-6.6.1-1"; rev = "arch-6.6.4-1";
hash = "sha256-GfxRzxFxDZoSZyEOzxr/Hz0IonbuwzkGaisKl3VYvlI="; hash = "sha256-uVNXwclBH72XeAgPWQr0I7lkhP+uGVlkT5N2xcBzbW4=";
}; };
# This is the owner and repo for the pre-patched kernel from the "linux-surface" project: # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: