cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #132481 from lovesegfault/rpi-updates

Browse source 
update RaspberryPi related packages
This commit is contained in:
Bernardo Meurer 2021-08-06 18:09:45 +00:00 committed by GitHub
commit 4efed9c571
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/libraspberrypi/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libraspberrypi";
version = "unstable-2021-03-17";
version = "unstable-2021-06-23";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615";
sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a";
rev = "97bc8180ad682b004ea224d1db7b8e108eda4397";
sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5";
};
patches = [

8
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2021-01-28";
version = "2021-06-28";
srcs = [
(fetchFromGitHub {
@ -16,8 +16,8 @@ stdenv.mkDerivation {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5";
sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp";
rev = "00de3194a96397c913786945ac0af1fd6fbec45b";
sha256 = "1xnr364dkiq6gmr21lcrj23hwc0g9y5qad8dm2maij647bgzp07r";
})
];
@ -28,6 +28,7 @@ stdenv.mkDerivation {
dontFixup = true;
installPhase = ''
runHook preInstall
mkdir -p "$out/lib/firmware/brcm"
# Wifi firmware
@ -37,6 +38,7 @@ stdenv.mkDerivation {
# Bluetooth firmware
cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm"
runHook postInstall
'';
outputHashMode = "recursive";

12
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
{ lib, stdenv, fetchFromGitHub }:
let
inherit (lib) optionals;
in
stdenv.mkDerivation {
pname = "raspberrypi-armstubs";
version = "2020-10-08";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "tools";
rev = "fc0e73c13865450e95edd046200e42a6e52d8256";
sha256 = "1g6ikpjcrm5x0rk5aiwjdd8grf997qkvgamcrdxy6k9ln746h25s";
rev = "2e59fc67d465510179155973d2b959e50a440e47";
sha256 = "1ysdl4qldy6ldf8cm1igxjisi14xl3s2pi6cnqzpxb38sgihb1vy";
};
NIX_CFLAGS_COMPILE = [
@ -37,13 +37,15 @@ stdenv.mkDerivation {
;
installPhase = ''
runHook preInstall
mkdir -vp $out/
cp -v *.bin $out/
runHook postInstall
'';
meta = with lib; {
description = "Firmware related ARM stubs for the Raspberry Pi";
homepage = https://github.com/raspberrypi/tools;
homepage = "https://github.com/raspberrypi/tools";
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ samueldr ];

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

@ -3,13 +3,13 @@
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20210303";
version = "1.20210805";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m";
sha256 = "1nndhjv4il42yw3pq8ni3r4nlp1m0r229fadrf4f9v51mgcg11i1";
};
installPhase = ''

13
pkgs/os-specific/linux/kernel/linux-rpi.nix
View file

@ -2,8 +2,8 @@
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "5.10.17";
tag = "1.20210303";
modDirVersion = "5.10.52";
tag = "1.20210805";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
@ -12,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // {
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx";
rev = tag;
sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b";
};
defconfig = {
@ -33,6 +33,11 @@ lib.overrideDerivation (buildLinux (args // {
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ../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 {