|
19 | 19 | if kernelVersion == "longterm" then |
20 | 20 | "6.12.19" |
21 | 21 | else if kernelVersion == "stable" then |
22 | | - "6.15.9" |
| 22 | + "6.16.9" |
23 | 23 | else |
24 | 24 | abort "Invalid kernel version: ${kernelVersion}"; |
25 | 25 |
|
|
28 | 28 | if kernelVersion == "longterm" then |
29 | 29 | "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=" |
30 | 30 | else if kernelVersion == "stable" then |
31 | | - "sha256-6U86+FSSMC96gZRBRY+AvKCtmRLlpMg8aZ/zxjxSlX0=" |
| 31 | + "sha256-esjIo88FR2N13qqoXfzuCVqCb/5Ve0N/Q3dPw7ZM5Y0=" |
32 | 32 | else |
33 | 33 | abort "Invalid kernel version: ${kernelVersion}"; |
34 | 34 |
|
|
38 | 38 | if kernelVersion == "longterm" then |
39 | 39 | "6.12.7" |
40 | 40 | else if kernelVersion == "stable" then |
41 | | - "6.15.3" |
| 41 | + "6.16.9" |
42 | 42 | else |
43 | 43 | abort "Invalid kernel version: ${kernelVersion}"; |
44 | 44 |
|
|
47 | 47 | if kernelVersion == "longterm" then |
48 | 48 | "sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY=" |
49 | 49 | else if kernelVersion == "stable" then |
50 | | - "sha256-ozvYrZDiVtMkdCcVnNEdlF2Kdw4jivW0aMJrDynN3Hk=" |
| 50 | + "sha256-grZY2DvEjRrr55D9Ov3I5NpXjgxB7z6bYn8K7iO8fOk=" |
51 | 51 | else |
52 | 52 | abort "Invalid kernel version: ${kernelVersion}"; |
53 | 53 |
|
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 |
55 | 65 | repos = |
56 | 66 | pkgs.callPackage |
57 | 67 | ( |
|
71 | 81 | ) |
72 | 82 | { |
73 | 83 | hash = pkgHash; |
74 | | - rev = "arch-${pkgVersion}-1"; |
| 84 | + rev = pkgRev; |
75 | 85 | }; |
76 | 86 |
|
77 | | - # Fetch and build the kernel package |
| 87 | + # Fetch and build the kernel source after applying the linux-surface patches |
78 | 88 | inherit (pkgs.callPackage ./kernel/linux-package.nix { inherit repos; }) |
79 | 89 | linuxPackage |
80 | 90 | surfacePatches |
|
0 commit comments