Merge pull request #1510 from 8bitbuddhist/surface-kernel-6.15

feat: update Surface stable kernel to 6.15.3
This commit is contained in:
Jörg Thalheim 2025-07-01 16:12:10 +02:00 committed by GitHub
commit 8b1f894089
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions

View file

@ -8,7 +8,7 @@ let
if kernelVersion == "longterm" then
"6.12.19"
else if kernelVersion == "stable" then
"6.14.2"
"6.15.3"
else
abort "Invalid kernel version: ${kernelVersion}";
@ -16,7 +16,7 @@ let
if kernelVersion == "longterm" then
"sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="
else if kernelVersion == "stable" then
"sha256-xcaCo1TqMZATk1elfTSnnlw3IhrOgjqTjhARa1d6Lhs="
"sha256-ErUMiZJUONnNc4WgyvycQz5lYqxd8AohiJ/On1SNZbA="
else
abort "Invalid kernel version: ${kernelVersion}";
@ -25,7 +25,7 @@ let
if kernelVersion == "longterm" then
"6.12.7"
else if kernelVersion == "stable" then
"6.14.2"
"6.15.3"
else
abort "Invalid kernel version: ${kernelVersion}";
@ -33,7 +33,7 @@ let
if kernelVersion == "longterm" then
"sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
else if kernelVersion == "stable" then
"sha256-Pzn+C52TtDcqDVepM5z2cVNCsnRDy0Wwn+FLwgsuicQ="
"sha256-ozvYrZDiVtMkdCcVnNEdlF2Kdw4jivW0aMJrDynN3Hk="
else
abort "Invalid kernel version: ${kernelVersion}";
@ -52,6 +52,7 @@ let
kernelPatches = surfacePatches {
version = pkgVersion;
patchFn = ./kernel/${versions.majorMinor pkgVersion}/patches.nix;
patchSrc = (repos.linux-surface + "/patches/${versions.majorMinor pkgVersion}");
};
kernelPackages = linuxPackage {
inherit kernelPatches; version = srcVersion;

View file

@ -29,7 +29,7 @@ let
in linuxPackages';
surfacePatches =
{ patchSrc ? (repos.linux-surface + "/patches/${versions.majorMinor version}"),
{ patchSrc,
version,
patchFn,
}: pkgs.callPackage patchFn {