Skip to content

Commit 8b1f894

Browse files
authored
Merge pull request #1510 from 8bitbuddhist/surface-kernel-6.15
feat: update Surface stable kernel to 6.15.3
2 parents 5e1493e + 5c3827a commit 8b1f894

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

microsoft/surface/common/default.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ let
88
if kernelVersion == "longterm" then
99
"6.12.19"
1010
else if kernelVersion == "stable" then
11-
"6.14.2"
11+
"6.15.3"
1212
else
1313
abort "Invalid kernel version: ${kernelVersion}";
1414

1515
srcHash = with config.hardware.microsoft-surface;
1616
if kernelVersion == "longterm" then
1717
"sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="
1818
else if kernelVersion == "stable" then
19-
"sha256-xcaCo1TqMZATk1elfTSnnlw3IhrOgjqTjhARa1d6Lhs="
19+
"sha256-ErUMiZJUONnNc4WgyvycQz5lYqxd8AohiJ/On1SNZbA="
2020
else
2121
abort "Invalid kernel version: ${kernelVersion}";
2222

@@ -25,15 +25,15 @@ let
2525
if kernelVersion == "longterm" then
2626
"6.12.7"
2727
else if kernelVersion == "stable" then
28-
"6.14.2"
28+
"6.15.3"
2929
else
3030
abort "Invalid kernel version: ${kernelVersion}";
3131

3232
pkgHash = with config.hardware.microsoft-surface;
3333
if kernelVersion == "longterm" then
3434
"sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
3535
else if kernelVersion == "stable" then
36-
"sha256-Pzn+C52TtDcqDVepM5z2cVNCsnRDy0Wwn+FLwgsuicQ="
36+
"sha256-ozvYrZDiVtMkdCcVnNEdlF2Kdw4jivW0aMJrDynN3Hk="
3737
else
3838
abort "Invalid kernel version: ${kernelVersion}";
3939

@@ -52,6 +52,7 @@ let
5252
kernelPatches = surfacePatches {
5353
version = pkgVersion;
5454
patchFn = ./kernel/${versions.majorMinor pkgVersion}/patches.nix;
55+
patchSrc = (repos.linux-surface + "/patches/${versions.majorMinor pkgVersion}");
5556
};
5657
kernelPackages = linuxPackage {
5758
inherit kernelPatches; version = srcVersion;

microsoft/surface/common/kernel/linux-package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let
2929
in linuxPackages';
3030

3131
surfacePatches =
32-
{ patchSrc ? (repos.linux-surface + "/patches/${versions.majorMinor version}"),
32+
{ patchSrc,
3333
version,
3434
patchFn,
3535
}: pkgs.callPackage patchFn {

0 commit comments

Comments
 (0)