mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge pull request #229947 from lovesegfault/rpi-updates
This commit is contained in:
commit
84549cb054
|
@ -2,22 +2,22 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "raspberrypi-wireless-firmware";
|
pname = "raspberrypi-wireless-firmware";
|
||||||
version = "2022-07-06";
|
version = "unstable-2023-05-04";
|
||||||
|
|
||||||
srcs = [
|
srcs = [
|
||||||
(fetchFromGitHub {
|
(fetchFromGitHub {
|
||||||
name = "bluez-firmware";
|
name = "bluez-firmware";
|
||||||
owner = "RPi-Distro";
|
owner = "RPi-Distro";
|
||||||
repo = "bluez-firmware";
|
repo = "bluez-firmware";
|
||||||
rev = "dd840d991939f5046959b8c564596c7228f9d41d";
|
rev = "9556b08ace2a1735127894642cc8ea6529c04c90";
|
||||||
hash = "sha512-XvF6IHDoKBJkSs0Wyt8O1vcCMpSNS9WSYopn0+EyCr4btABGsHWTkgxb4nQbd+VbE6Ls2dcKr+c+X6aw/y1jhQ==";
|
hash = "sha256-gKGK0XzNrws5REkKg/JP6SZx3KsJduu53SfH3Dichkc=";
|
||||||
})
|
})
|
||||||
(fetchFromGitHub {
|
(fetchFromGitHub {
|
||||||
name = "firmware-nonfree";
|
name = "firmware-nonfree";
|
||||||
owner = "RPi-Distro";
|
owner = "RPi-Distro";
|
||||||
repo = "firmware-nonfree";
|
repo = "firmware-nonfree";
|
||||||
rev = "541e5a05d152e7e6f0d9be45622e4a3741e51c02";
|
rev = "2b465a10b04555b7f45b3acb85959c594922a3ce";
|
||||||
hash = "sha512-0erVWiFom0V5AMu+XlolJnY9Q5/RCFlZwUovMBMNdEPb+L5rHcCdrA7zehDX1oRNe8DPb4S5gjny0iG/G7G6NQ==";
|
hash = "sha256-9UgB8f2AaxG7S5Px46jOP9wUeO1VXKB0uJiPWh32oDI=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -37,11 +37,6 @@ stdenvNoCC.mkDerivation {
|
||||||
# Bluetooth firmware
|
# Bluetooth firmware
|
||||||
cp -rv "$NIX_BUILD_TOP/bluez-firmware/broadcom/." "$out/lib/firmware/brcm"
|
cp -rv "$NIX_BUILD_TOP/bluez-firmware/broadcom/." "$out/lib/firmware/brcm"
|
||||||
|
|
||||||
# CM4 symlink must be added since it's missing from upstream
|
|
||||||
pushd $out/lib/firmware/brcm &>/dev/null
|
|
||||||
ln -s "./brcmfmac43455-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt"
|
|
||||||
popd &>/dev/null
|
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -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.20230106";
|
version = "1.20230405";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "raspberrypi";
|
owner = "raspberrypi";
|
||||||
repo = "firmware";
|
repo = "firmware";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha512-iKUR16RipN8BGAmXteTJUzd/P+m5gnbWCJ28LEzYfOTJnGSal63zI7LDQg/HIKXx9wMTARQKObeKn+7ioS4QkA==";
|
hash = "sha256-UtUd1MbsrDFxd/1C3eOAMDKPZMx+kSMFYOJP+Kc6IU8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
@ -26,6 +26,8 @@ stdenvNoCC.mkDerivation rec {
|
||||||
homepage = "https://github.com/raspberrypi/firmware";
|
homepage = "https://github.com/raspberrypi/firmware";
|
||||||
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
|
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
|
||||||
maintainers = with maintainers; [ dezgeg ];
|
maintainers = with maintainers; [ dezgeg ];
|
||||||
broken = stdenvNoCC.isDarwin; # Hash mismatch on source, mystery.
|
# Hash mismatch on source, mystery.
|
||||||
|
# Maybe due to https://github.com/NixOS/nix/issues/847
|
||||||
|
broken = stdenvNoCC.isDarwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
|
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
|
||||||
modDirVersion = "5.15.84";
|
modDirVersion = "6.1.21";
|
||||||
tag = "1.20230106";
|
tag = "1.20230405";
|
||||||
in
|
in
|
||||||
lib.overrideDerivation (buildLinux (args // {
|
lib.overrideDerivation (buildLinux (args // {
|
||||||
version = "${modDirVersion}-${tag}";
|
version = "${modDirVersion}-${tag}";
|
||||||
|
@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // {
|
||||||
owner = "raspberrypi";
|
owner = "raspberrypi";
|
||||||
repo = "linux";
|
repo = "linux";
|
||||||
rev = tag;
|
rev = tag;
|
||||||
hash = "sha512-6Dcpo81JBvc8NOv1nvO8JwjUgOOviRgHmXLLcGpE/pI2lEOcSeDRlB/FZtflzXTGilapvmwOSx5NxQfAmysHqQ==";
|
hash = "sha256-ILwecHZ1BN6GhZAUB6/UwiN/rZ8gHndKON6DUhidtxI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
defconfig = {
|
defconfig = {
|
||||||
|
@ -27,19 +27,6 @@ lib.overrideDerivation (buildLinux (args // {
|
||||||
efiBootStub = false;
|
efiBootStub = false;
|
||||||
} // (args.features or {});
|
} // (args.features or {});
|
||||||
|
|
||||||
extraConfig = ''
|
|
||||||
# ../drivers/gpu/drm/ast/ast_mode.c:851:18: error: initialization of 'void (*)(struct drm_crtc *, struct drm_atomic_state *)' from incompatible pointer type 'void (*)(struct drm_crtc *, struct drm_crtc_state *)' [-Werror=incompatible-pointer-types]
|
|
||||||
# 851 | .atomic_flush = ast_crtc_helper_atomic_flush,
|
|
||||||
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
# ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush')
|
|
||||||
DRM_AST n
|
|
||||||
# ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_commit_tail':
|
|
||||||
# ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7757:4: error: implicit declaration of function 'is_hdr_metadata_different' [-Werror=implicit-function-declaration]
|
|
||||||
# 7757 | is_hdr_metadata_different(old_con_state, new_con_state);
|
|
||||||
# | ^~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
DRM_AMDGPU n
|
|
||||||
'';
|
|
||||||
|
|
||||||
extraMeta = if (rpiVersion < 3) then {
|
extraMeta = if (rpiVersion < 3) then {
|
||||||
platforms = with lib.platforms; arm;
|
platforms = with lib.platforms; arm;
|
||||||
hydraPlatforms = [];
|
hydraPlatforms = [];
|
||||||
|
|
Loading…
Reference in a new issue