|
3 | 3 | let
|
4 | 4 | inherit (lib) mkDefault mkOption types;
|
5 | 5 |
|
6 |
| - version = config.microsoft-surface.kernelVersion; |
7 |
| - rev = |
8 |
| - if version == "6.12" then |
9 |
| - "arch-6.12.19-1" |
10 |
| - else if version == "6.13" then |
11 |
| - "arch-6.13.6-1" |
| 6 | + shortVersion = config.microsoft-surface.kernelVersion; |
| 7 | + version = if shortVersion == "6.12" then |
| 8 | + "6.12.19" |
| 9 | + else if shortVersion == "6.13" then |
| 10 | + "6.13.6" |
12 | 11 | else
|
13 |
| - abort "Invalid kernel version: ${version}"; |
| 12 | + abort "Invalid kernel version: ${shortVersion}"; |
| 13 | + |
| 14 | + rev = "arch-${version}-1"; |
14 | 15 |
|
15 | 16 | hash =
|
16 |
| - if version == "6.12" then |
| 17 | + if shortVersion == "6.12" then |
17 | 18 | "sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
|
18 |
| - else if version == "6.13" then |
| 19 | + else if shortVersion == "6.13" then |
19 | 20 | "sha256-otD1ckNxNnvV8xipf9SZpbfg+bBq5EPwyieYtLIV4Ck="
|
20 | 21 | else
|
21 |
| - abort "Invalid kernel version: ${version}"; |
| 22 | + abort "Invalid kernel version: ${shortVersion}"; |
| 23 | + |
| 24 | + srcHash = |
| 25 | + if shortVersion == "6.12" then |
| 26 | + "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=" |
| 27 | + else if shortVersion == "6.13" then |
| 28 | + "sha256-3gBTy0E9QI8g/R1XiCGZUbikQD5drBsdkDIJCTis0Zk=" |
| 29 | + else |
| 30 | + abort "Invalid kernel version: ${shortVersion}"; |
22 | 31 |
|
23 | 32 | inherit (pkgs.callPackage ./kernel/linux-package.nix { repos = pkgs.callPackage ./kernel/repos.nix { rev = rev; hash = hash; }; }) linuxPackage surfacePatches;
|
24 | 33 |
|
25 | 34 | kernelPatches = surfacePatches {
|
26 | 35 | inherit version;
|
27 |
| - patchFn = ./kernel/${version}/patches.nix; |
| 36 | + patchFn = ./kernel/${shortVersion}/patches.nix; |
28 | 37 | };
|
29 | 38 | kernelPackages = linuxPackage {
|
30 | 39 | inherit version kernelPatches;
|
31 |
| - sha256 = "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="; |
| 40 | + sha256 = srcHash; |
32 | 41 | ignoreConfigErrors=true;
|
33 | 42 | };
|
34 | 43 |
|
|
0 commit comments