eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-23 11:29:42 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into microsoft/surface/kernel-6.6

Browse source
This commit is contained in:
mexisme 2024-01-31 11:53:54 +13:00
commit f2fbed9ce6
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
microsoft/surface/common/kernel/linux-6.6.x/default.nix
View file

@ -7,14 +7,15 @@ let
cfg = config.microsoft-surface; cfg = config.microsoft-surface;
version = "6.6.10"; version = "6.6.13";
kernelPatches = surfacePatches { kernelPatches = surfacePatches {
inherit version; inherit version;
patchFn = ./patches.nix; patchFn = ./patches.nix;
}; };
kernelPackages = linuxPackage2 { kernelPackages = linuxPackage2 {
inherit version kernelPatches; inherit version kernelPatches;
sha256 = "sha256-nuYn5MEJrsf8o+2liY6B0gGvLH6y99nX2UwfDhIFVGw="; sha256 = "sha256-iLiefdQerU46seQRyLuNWSV1rPgVzx3zwNxX4uiCwLw=";
ignoreConfigErrors=true;
}; };
in { in {

10
microsoft/surface/common/kernel/linux-6.6.x/patches.nix
View file

@ -8,10 +8,12 @@
{ {
name = "microsoft-surface-patches-linux-${version}"; name = "microsoft-surface-patches-linux-${version}";
patch = null; patch = null;
structuredExtraConfig = with kernel; { extraStructuredConfig = with kernel; {
## STAGING_MEDIA = yes;
## Surface Aggregator Module
## #
# Surface Aggregator Module
#
SURFACE_AGGREGATOR = module; SURFACE_AGGREGATOR = module;
# SURFACE_AGGREGATOR_ERROR_INJECTION is not set # SURFACE_AGGREGATOR_ERROR_INJECTION is not set
SURFACE_AGGREGATOR_BUS = yes; SURFACE_AGGREGATOR_BUS = yes;

4
starfive/visionfive/v2/uboot.nix
View file

@ -6,13 +6,13 @@
}: }:
buildUBoot rec { buildUBoot rec {
version = "2024.01-rc5"; version = "2024.01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "u-boot"; owner = "u-boot";
repo = "u-boot"; repo = "u-boot";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-QlwgvnSaXh39z9AM7HNF731lRiUkPbN3oQyioQNTYFA="; hash = "sha256-0Da7Czy9cpQ+D5EICc3/QSZhAdCBsmeMvBgykYhAQFw=";
}; };
# workaround for https://github.com/NixOS/nixpkgs/pull/146634 # workaround for https://github.com/NixOS/nixpkgs/pull/146634