raspberry-pi/common/kernel: 6.12.75-1+rpt1 -> 6.18.33-1+rpt1

This commit is contained in:
Jamie Magee 2026-06-13 11:26:51 -07:00
parent 6358ff7682
commit 4292c91856

View file

@ -10,8 +10,8 @@
let
# NOTE: raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.12.75";
hash = "sha256-qrljd20n4tj/7C7gzNnxw7JIyEF2Ppf1PWm2a7vxh1w=";
modDirVersion = "6.18.33";
hash = "sha256-XGL2SgPws+c1yAZDmNC9jQdi23qQPZKucQUr9+eD8MM=";
inherit (lib.kernel) freeform yes no;
in
(buildLinux (
@ -24,8 +24,8 @@ in
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
# https://github.com/RPi-Distro/linux-packaging/raw/refs/tags/pios/1%256.12.75-1+rpt1/debian/changelog
rev = "89050b1059997d38d55462b323b099a6436dc10d";
# https://github.com/RPi-Distro/linux-packaging/raw/refs/tags/pios/1%256.18.33-1+rpt1/debian/changelog
rev = "95b85bebbedcaedfa7ca79116ed38b7376fba412";
inherit hash;
};
@ -52,7 +52,7 @@ in
];
# Override nixpkgs common-config.nix defaults that conflict with the RPi vendor defconfigs.
# See: https://github.com/raspberrypi/linux/tree/rpi-6.12.y/arch/arm64/configs
# See: https://github.com/raspberrypi/linux/tree/rpi-6.18.y/arch/arm64/configs
structuredExtraConfig = {
# RPi has 4 cores; nixpkgs common-config sets 384
NR_CPUS = lib.mkForce (freeform "4");
@ -110,7 +110,7 @@ in
dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
rm $dtbDir/bcm283*.dtb
copyDTB() {
cp -v "$dtbDir/$1" "$dtbDir/$2"
cp "$dtbDir/$1" "$dtbDir/$2"
}
''
+ lib.optionalString (rpiVersion == 1) ''