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

Merge branch 'microsoft/surface/refactor-kernel-code' into microsoft/surface/kernel-6.0.11

Browse source
This commit is contained in:
mexisme 2022-12-05 13:41:07 +13:00
parent 87597ab307 b01a6d58df
commit 76c6688e86
3 changed files with 78 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,14 @@ let
pkgs.callPackage ./linux-5.19.17.nix { inherit repos; } pkgs.callPackage ./linux-5.19.17.nix { inherit repos; }
); );
linux-6_0_11 = linuxPackage (
pkgs.callPackage ./linux-6.0.11.nix { inherit repos; }
);
in { in {
<<<<<<< Updated upstream
boot.kernelPackages = linux-5_19_17; boot.kernelPackages = linux-5_19_17;
=======
boot.kernelPackages = linux-6_0_11;
>>>>>>> Stashed changes
} }

68
microsoft/surface/kernel/linux-6.0.11.nix Normal file
View file

@ -0,0 +1,68 @@
{ lib,
fetchurl,
repos,
}:
let
inherit (lib) kernel;
version = "6.0.11";
branch = "6.0";
patches = repos.linux-surface + "/patches/${branch}";
in {
inherit version branch;
modDirVersion = version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "sha256-K65hMeZJceHjT/OV+lQpcRNMhXvbCykGmrhHx8mpx2I=";
};
kernelPatches = [
{
name = "microsoft-surface-patches-linux-${version}";
patch = null;
structuredExtraConfig = with lib.kernel; {
};
}
{
name = "ms-surface/0001-surface3-oemb";
patch = patches + "/0001-surface3-oemb.patch";
}
{
name = "ms-surface/0002-mwifiex";
patch = patches + "/0002-mwifiex.patch";
}
{
name = "ms-surface/0003-ath10k";
patch = patches + "/0003-ath10k.patch";
}
{
name = "ms-surface/0004-ipts";
patch = patches + "/0004-ipts.patch";
}
{
name = "ms-surface/0005-surface-sam";
patch = patches + "/0005-surface-sam.patch";
}
{
name = "ms-surface/0006-surface-sam-over-hid";
patch = patches + "/0006-surface-sam-over-hid.patch";
}
{
name = "ms-surface/0007-surface-button";
patch = patches + "/0007-surface-button.patch";
}
{
name = "ms-surface/0008-surface-typecover";
patch = patches + "/0008-surface-typecover.patch";
}
{
name = "ms-surface/0009-cameras";
patch = patches + "/0009-cameras.patch";
}
# {
# name = "ms-surface/0010-amd-gpio";
# patch = patches + "/0010-amd-gpio.patch";
# }
];
}

4
microsoft/surface/repos.nix
View file

@ -2,8 +2,8 @@
linux-surface = fetchFromGitHub { linux-surface = fetchFromGitHub {
owner = "linux-surface"; owner = "linux-surface";
repo = "linux-surface"; repo = "linux-surface";
rev = "6d0fa58a6eadda44b35a3c5e60db2ed0fa0c101e"; rev = "8995c6b3b4fb659397f4ebc760c6ac8b5efc5488";
sha256 = "sha256-Jf6DN/pZaGIk58pA+CUylpl09Wi4vA3vKZC60b3WcOg="; sha256 = "sha256-r7nbW0WKmvw7mMZL1BzuFwgwftyN5FIfP5xLDiQMEiI=";
}; };
# 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: