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
5 changed files with 25 additions and 22 deletions
@@ -2,22 +2,22 @@
stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2020-12-01";
version = "2021-01-28";
srcs = [
(fetchFromGitHub {
name = "bluez-firmware";
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc";
sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27";
rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";
sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b";
})
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "b66ab26cebff689d0d3257f56912b9bb03c20567";
sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f";
rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5";
sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp";
})
];
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h";
outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby";
meta = with lib; {
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";
@@ -3,13 +3,13 @@
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20201201";
version = "1.20210201";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n";
sha256 = "0frmsixzy9nd8nfg15jsz037522h4gq1hca666cyaf9zg2sa1i7i";
};
installPhase = ''