Skip to content

Commit 71154bb

Browse files
committed
microsoft/surface: update stable linux-surface to 6.16.9
1 parent 3441b52 commit 71154bb

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

microsoft/surface/common/default.nix

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let
1919
if kernelVersion == "longterm" then
2020
"6.12.19"
2121
else if kernelVersion == "stable" then
22-
"6.15.9"
22+
"6.16.9"
2323
else
2424
abort "Invalid kernel version: ${kernelVersion}";
2525

@@ -28,7 +28,7 @@ let
2828
if kernelVersion == "longterm" then
2929
"sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="
3030
else if kernelVersion == "stable" then
31-
"sha256-6U86+FSSMC96gZRBRY+AvKCtmRLlpMg8aZ/zxjxSlX0="
31+
"sha256-esjIo88FR2N13qqoXfzuCVqCb/5Ve0N/Q3dPw7ZM5Y0="
3232
else
3333
abort "Invalid kernel version: ${kernelVersion}";
3434

@@ -38,7 +38,7 @@ let
3838
if kernelVersion == "longterm" then
3939
"6.12.7"
4040
else if kernelVersion == "stable" then
41-
"6.15.3"
41+
"6.16.9"
4242
else
4343
abort "Invalid kernel version: ${kernelVersion}";
4444

@@ -47,11 +47,21 @@ let
4747
if kernelVersion == "longterm" then
4848
"sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
4949
else if kernelVersion == "stable" then
50-
"sha256-ozvYrZDiVtMkdCcVnNEdlF2Kdw4jivW0aMJrDynN3Hk="
50+
"sha256-grZY2DvEjRrr55D9Ov3I5NpXjgxB7z6bYn8K7iO8fOk="
5151
else
5252
abort "Invalid kernel version: ${kernelVersion}";
5353

54-
# Fetch the linux-surface package
54+
# Set the commit for the linux-surface release
55+
pkgRev =
56+
with config.hardware.microsoft-surface;
57+
if kernelVersion == "longterm" then
58+
"add4c31a06d80393e34b6cae07f0f6c92fb2ec31"
59+
else if kernelVersion == "stable" then
60+
"94217c2dc8818afd2296c3776223fc1c093f78fb"
61+
else
62+
abort "Invalid kernel version: ${kernelVersion}";
63+
64+
# Fetch the linux-surface repository
5565
repos =
5666
pkgs.callPackage
5767
(
@@ -71,10 +81,10 @@ let
7181
)
7282
{
7383
hash = pkgHash;
74-
rev = "arch-${pkgVersion}-1";
84+
rev = pkgRev;
7585
};
7686

77-
# Fetch and build the kernel package
87+
# Fetch and build the kernel source after applying the linux-surface patches
7888
inherit (pkgs.callPackage ./kernel/linux-package.nix { inherit repos; })
7989
linuxPackage
8090
surfacePatches

0 commit comments

Comments
 (0)