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

Merge pull request #113363 from mweinelt/rpi

This commit is contained in:
Martin Weinelt 2021-04-05 05:07:37 +02:00 committed by GitHub
parent 36a661333a a79a1b4978
commit 791c91ff52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 22 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 { stdenv.mkDerivation rec {
pname = "libraspberrypi"; pname = "libraspberrypi";
version = "unstable-2020-11-30"; version = "unstable-2021-01-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "userland"; repo = "userland";
rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11"; rev = "4a0a19b88b43e48c6b51b526b9378289fb712a4c";
sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7"; sha256 = "0g3a1a7w717h0fwk39banzgjwphh62fx64k130w2s5885lsn5r5k";
}; };
patches = [ patches = [

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

@ -2,22 +2,22 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware"; pname = "raspberrypi-wireless-firmware";
version = "2020-12-01"; version = "2021-01-28";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
name = "bluez-firmware"; name = "bluez-firmware";
owner = "RPi-Distro"; owner = "RPi-Distro";
repo = "bluez-firmware"; repo = "bluez-firmware";
rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc"; rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";
sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27"; sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b";
}) })
(fetchFromGitHub { (fetchFromGitHub {
name = "firmware-nonfree"; name = "firmware-nonfree";
owner = "RPi-Distro"; owner = "RPi-Distro";
repo = "firmware-nonfree"; repo = "firmware-nonfree";
rev = "b66ab26cebff689d0d3257f56912b9bb03c20567"; rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5";
sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f"; sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp";
}) })
]; ];
@ -41,7 +41,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h"; outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby";
meta = with lib; { meta = with lib; {
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";

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.20201201"; version = "1.20210201";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = version; rev = version;
sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n"; sha256 = "0frmsixzy9nd8nfg15jsz037522h4gq1hca666cyaf9zg2sa1i7i";
}; };
installPhase = '' installPhase = ''

19
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 = "5.4.79"; modDirVersion = "5.10.11";
tag = "1.20201201"; tag = "1.20210201";
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 = "raspberrypi-kernel_${tag}-1"; rev = "raspberrypi-kernel_${tag}-1";
sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9"; sha256 = "0n4zq47k9bmkgmarrhwvivp10v5ga8y2bphsx0il3kmcpf0c1m3q";
}; };
defconfig = { defconfig = {
@ -23,15 +23,18 @@ lib.overrideDerivation (buildLinux (args // {
"4" = "bcm2711_defconfig"; "4" = "bcm2711_defconfig";
}.${toString rpiVersion}; }.${toString rpiVersion};
extraConfig = ''
# ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources'
PCIE_ALTERA n
'';
features = { features = {
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
'';
extraMeta = if (rpiVersion < 3) then { extraMeta = if (rpiVersion < 3) then {
platforms = with lib.platforms; [ arm ]; platforms = with lib.platforms; [ arm ];
hydraPlatforms = []; hydraPlatforms = [];

6
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
View File

@ -3,13 +3,13 @@
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "raspberrypi-eeprom"; pname = "raspberrypi-eeprom";
version = "2020-12-11"; version = "2021-01-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "rpi-eeprom"; repo = "rpi-eeprom";
rev = "54a9796abbee59067bff9da6b90c1014178f2c21"; rev = "54cadc816ba739afd08ead6d679e647de028a65c";
sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk"; sha256 = "0zlacr4z6h40h0g47195xsbss29gaa7kf8r31h372sxsn8srlnjf";
}; };
buildInputs = [ python3 ]; buildInputs = [ python3 ];