gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-rpi, raspberrypifw: 6.6.31-stable_20240529 -> 6.6.51-stable_20241008 (#353509)

Browse Source
This commit is contained in:
Sefa Eyeoglu
2024-11-18 10:37:45 +01:00
committed by GitHub
parent db12662f60 fb43b7067e
commit 10343b095a
2 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@@ -3,13 +3,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi # NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware"; pname = "raspberrypi-firmware";
version = "1.20240926"; version = "1.20241008";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = version; rev = version;
hash = "sha256-MCutxzdSFoZ4hn2Fxk2AHHgWCt/Jgc+reqJZHUuSKOc="; hash = "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=";
}; };
installPhase = '' installPhase = ''

33
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@@ -2,8 +2,8 @@
let let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.6.31"; modDirVersion = "6.6.51";
tag = "stable_20240529"; tag = "stable_20241008";
in in
lib.overrideDerivation (buildLinux (args // { lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}"; version = "${modDirVersion}-${tag}";
@@ -14,7 +14,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "linux"; repo = "linux";
rev = tag; rev = tag;
hash = "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink="; hash = "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=";
}; };
defconfig = { defconfig = {
@@ -24,37 +24,10 @@ lib.overrideDerivation (buildLinux (args // {
"4" = "bcm2711_defconfig"; "4" = "bcm2711_defconfig";
}.${toString rpiVersion}; }.${toString rpiVersion};
structuredExtraConfig = (args.structuredExtraConfig or {}) // (with lib.kernel; {
# Workaround https://github.com/raspberrypi/linux/issues/6198
# Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
# DRM_KMS_HELPER=y.
BACKLIGHT_CLASS_DEVICE = yes;
});
features = { features = {
efiBootStub = false; efiBootStub = false;
} // (args.features or {}); } // (args.features or {});
kernelPatches = (args.kernelPatches or []) ++ [
# Fix compilation errors due to incomplete patch backport.
# https://github.com/raspberrypi/linux/pull/6223
{
name = "gpio-pwm_-_pwm_apply_might_sleep.patch";
patch = fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch";
hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI=";
};
}
{
name = "ir-rx51_-_pwm_apply_might_sleep.patch";
patch = fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch";
hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE=";
};
}
];
extraMeta = if (rpiVersion < 3) then { extraMeta = if (rpiVersion < 3) then {
platforms = with lib.platforms; arm; platforms = with lib.platforms; arm;
hydraPlatforms = []; hydraPlatforms = [];