nixos/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-08 19:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 76c6688e86
3 changed files with 78 additions and 2 deletions
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; }
);
linux-6_0_11 = linuxPackage (
pkgs.callPackage ./linux-6.0.11.nix { inherit repos; }
);
in {
<<<<<<< Updated upstream
boot.kernelPackages = linux-5_19_17;
=======
boot.kernelPackages = linux-6_0_11;
>>>>>>> Stashed changes
}