git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #132481 from lovesegfault/rpi-updates

update RaspberryPi related packages

commit4efed9c571d8592a52cd8c135804e3811357f3e8 authorBernardo Meurer <bernardo@meurer.org> dateFri 6 Aug 2021, 18:09 (5 years ago) parent2b967c6c181d99
5 files changed+26−17
compare with master
unifiedsplit
pkgs/development/libraries/libraspberrypi/default.nix+3−3 pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix+5−3 pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix+7−5 pkgs/os-specific/linux/firmware/raspberrypi/default.nix+2−2 pkgs/os-specific/linux/kernel/linux-rpi.nix+9−4
pkgs/development/libraries/libraspberrypi/default.nix+3−3
@@ -7,13 +7,13 @@
77
88stdenv.mkDerivation rec {
99 pname = "libraspberrypi";
10− version = "unstable-2021-03-17";
10+ version = "unstable-2021-06-23";
1111
1212 src = fetchFromGitHub {
1313 owner = "raspberrypi";
1414 repo = "userland";
15− rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615";
16− sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a";
15+ rev = "97bc8180ad682b004ea224d1db7b8e108eda4397";
16+ sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5";
1717 };
1818
1919 patches = [
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix+5−3
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation {
44 pname = "raspberrypi-wireless-firmware";
5− version = "2021-01-28";
5+ version = "2021-06-28";
66
77 srcs = [
88 (fetchFromGitHub {
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
1616 name = "firmware-nonfree";
1717 owner = "RPi-Distro";
1818 repo = "firmware-nonfree";
19− rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5";
20− sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp";
19+ rev = "00de3194a96397c913786945ac0af1fd6fbec45b";
20+ sha256 = "1xnr364dkiq6gmr21lcrj23hwc0g9y5qad8dm2maij647bgzp07r";
2121 })
2222 ];
2323
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
2828 dontFixup = true;
2929
3030 installPhase = ''
31+ runHook preInstall
3132 mkdir -p "$out/lib/firmware/brcm"
3233
3334 # Wifi firmware
@@ -37,6 +38,7 @@ stdenv.mkDerivation {
3738
3839 # Bluetooth firmware
3940 cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm"
41+ runHook postInstall
4042 '';
4143
4244 outputHashMode = "recursive";
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix+7−5
@@ -1,17 +1,17 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
1+{ lib, stdenv, fetchFromGitHub }:
22
33let
44 inherit (lib) optionals;
55in
66stdenv.mkDerivation {
77 pname = "raspberrypi-armstubs";
8− version = "2020-10-08";
8+ version = "2021-07-05";
99
1010 src = fetchFromGitHub {
1111 owner = "raspberrypi";
1212 repo = "tools";
13− rev = "fc0e73c13865450e95edd046200e42a6e52d8256";
14− sha256 = "1g6ikpjcrm5x0rk5aiwjdd8grf997qkvgamcrdxy6k9ln746h25s";
13+ rev = "2e59fc67d465510179155973d2b959e50a440e47";
14+ sha256 = "1ysdl4qldy6ldf8cm1igxjisi14xl3s2pi6cnqzpxb38sgihb1vy";
1515 };
1616
1717 NIX_CFLAGS_COMPILE = [
@@ -37,13 +37,15 @@ stdenv.mkDerivation {
3737 ;
3838
3939 installPhase = ''
40+ runHook preInstall
4041 mkdir -vp $out/
4142 cp -v *.bin $out/
43+ runHook postInstall
4244 '';
4345
4446 meta = with lib; {
4547 description = "Firmware related ARM stubs for the Raspberry Pi";
46− homepage = https://github.com/raspberrypi/tools;
48+ homepage = "https://github.com/raspberrypi/tools";
4749 license = licenses.bsd3;
4850 platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
4951 maintainers = with maintainers; [ samueldr ];
pkgs/os-specific/linux/firmware/raspberrypi/default.nix+2−2
@@ -3,13 +3,13 @@
33stdenvNoCC.mkDerivation rec {
44 # NOTE: this should be updated with linux_rpi
55 pname = "raspberrypi-firmware";
6− version = "1.20210303";
6+ version = "1.20210805";
77
88 src = fetchFromGitHub {
99 owner = "raspberrypi";
1010 repo = "firmware";
1111 rev = version;
12− sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m";
12+ sha256 = "1nndhjv4il42yw3pq8ni3r4nlp1m0r229fadrf4f9v51mgcg11i1";
1313 };
1414
1515 installPhase = ''
pkgs/os-specific/linux/kernel/linux-rpi.nix+9−4
@@ -2,8 +2,8 @@
22
33let
44 # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
5− modDirVersion = "5.10.17";
6− tag = "1.20210303";
5+ modDirVersion = "5.10.52";
6+ tag = "1.20210805";
77in
88lib.overrideDerivation (buildLinux (args // {
99 version = "${modDirVersion}-${tag}";
@@ -12,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // {
1212 src = fetchFromGitHub {
1313 owner = "raspberrypi";
1414 repo = "linux";
15− rev = "raspberrypi-kernel_${tag}-1";
16− sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx";
15+ rev = tag;
16+ sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b";
1717 };
1818
1919 defconfig = {
@@ -33,6 +33,11 @@ lib.overrideDerivation (buildLinux (args // {
3333 # | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
3434 # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush')
3535 DRM_AST n
36+ # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_commit_tail':
37+ # ../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]
38+ # 7757 | is_hdr_metadata_different(old_con_state, new_con_state);
39+ # | ^~~~~~~~~~~~~~~~~~~~~~~~~
40+ DRM_AMDGPU n
3641 '';
3742
3843 extraMeta = if (rpiVersion < 3) then {