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

Merge #533

Browse source 
533: Update the 6.0.* kernel version to 6.0.17 for Microsoft Surface profile r=Mic92 a=mexisme



Co-authored-by: mexisme <wildjim+dev@kiwinet.org>
This commit is contained in:
bors[bot] 2023-01-10 07:47:15 +00:00 committed by GitHub
parent 48745e081c 0c474cb9e1
commit df029cfefc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
microsoft/surface/default.nix
View file

@ -9,7 +9,7 @@ in {
./firmware/surface-go/ath10k ./firmware/surface-go/ath10k
]; ];
microsoft-surface.kernelVersion = mkDefault "6.0.11"; microsoft-surface.kernelVersion = mkDefault "6.0.17";
boot.extraModprobeConfig = mkDefault '' boot.extraModprobeConfig = mkDefault ''
options i915 enable_fbc=1 enable_rc6=1 modeset=1 options i915 enable_fbc=1 enable_rc6=1 modeset=1

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

@ -6,7 +6,7 @@ let
in { in {
imports = [ imports = [
./linux-5.19.17 ./linux-5.19.17
./linux-6.0.11 ./linux-6.0.17
]; ];
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {

8
microsoft/surface/kernel/linux-6.0.11/default.nix → microsoft/surface/kernel/linux-6.0.17/default.nix
View file

@ -8,7 +8,7 @@ let
cfg = config.microsoft-surface; cfg = config.microsoft-surface;
version = "6.0.11"; version = "6.0.17";
extraMeta.branch = "6.0"; extraMeta.branch = "6.0";
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 = "sha256-K65hMeZJceHjT/OV+lQpcRNMhXvbCykGmrhHx8mpx2I="; sha256 = "sha256-p+6SCSpUWbtGq/C1RJpOV+i3klkaxOesBO0lQtLOHQg=";
}; };
}; };
in { in {
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {
type = types.enum [ "6.0.11" ]; type = types.enum [ "6.0.17" ];
}; };
config = mkIf (cfg.kernelVersion == "6.0.11") { config = mkIf (cfg.kernelVersion == "6.0.17") {
boot = { boot = {
inherit kernelPackages; inherit kernelPackages;
}; };

12
microsoft/surface/kernel/linux-6.0.11/patches.nix → microsoft/surface/kernel/linux-6.0.17/patches.nix
View file

@ -111,8 +111,12 @@
name = "ms-surface/0009-cameras"; name = "ms-surface/0009-cameras";
patch = patchDir + "/0009-cameras.patch"; patch = patchDir + "/0009-cameras.patch";
} }
# { {
# name = "ms-surface/0010-amd-gpio"; name = "ms-surface/0010-amd-gpio";
# patch = patchDir + "/0010-amd-gpio.patch"; patch = patchDir + "/0010-amd-gpio.patch";
# } }
{
name = "ms-surface/0011-rtc";
patch = patchDir + "/0011-rtc.patch";
}
] ]

4
microsoft/surface/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 = "8995c6b3b4fb659397f4ebc760c6ac8b5efc5488"; rev = "487e64047ca047dde9a062909a87410e7bb86845";
sha256 = "sha256-r7nbW0WKmvw7mMZL1BzuFwgwftyN5FIfP5xLDiQMEiI="; sha256 = "sha256-HTIuRBZk0prhUPd2KnsXGo+ZyBsMwERN7P8WJH1RG3M=";
}; };
# 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: