lenn/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-06 18:08:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 5e1493ea8e 5c3827a686
commit 8b1f894089
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
microsoft/surface/common/default.nix
View File

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

0
microsoft/surface/common/kernel/6.14/patches.nix → microsoft/surface/common/kernel/6.15/patches.nix
View File

2
microsoft/surface/common/kernel/linux-package.nix
View File

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