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

Merge pull request #167474 from lovesegfault/update-rpi-pkgs

Browse source 
treewide: update raspberrypi packages
This commit is contained in:
Bernardo Meurer 2022-04-21 16:41:14 -07:00 committed by GitHub
commit 354d21cb5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 28 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-10-25";
version = "unstable-2022-03-23";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b";
sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU=";
rev = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e";
hash = "sha256-sAfpfq7C9HXVS7ym3UFIO6bpEIWFCOfVCSN2n5q1RNg=";
};
patches = [

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

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2021-11-02";
version = "2021-12-06";
srcs = [
(fetchFromGitHub {
@ -10,14 +10,14 @@ stdenv.mkDerivation {
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";
sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b";
hash = "sha256-6xBdXwAGA1N42k1KKYrEgtsxtFAtrwhKdIrYY39Fb7Y=";
})
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "54ffdd6e2ea6055d46656b78e148fe7def3ec9d8";
sha256 = "4WTrs/tUyOugufRrrh0qsEmhPclQD64ypYysxsnOyS8=";
rev = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc";
hash = "sha256-xg6fYQvg7t2ikyLI8/XfpiNaNTf7CNFQlAzpTldTz10=";
})
];
@ -44,7 +44,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "l+7VOq7CV5QA8/FWjMBGDcxq8Qe7NFf6E2Y42htZEgE=";
outputHash = "sha256-Fw8EC1jzszWg9rNH01oaOIHnSYDuF6ov6ulmIAPuNz4=";
meta = with lib; {
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";

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

@ -1,17 +1,17 @@
{ lib, stdenvNoCC, fetchurl, unzip }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20220118";
version = "1.20220331";
src = fetchurl {
url = "https://github.com/raspberrypi/firmware/archive/${version}.zip";
sha256 = "sha256-98rbwKIuB7vb4MWbFCr7TYsvJB0HzPdH8Tw0+bktK/M=";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
hash = "sha256-TxlpHPEJAtVJTtDghuJpx2mLjEPiKkcAr7S9Cd/cocE=";
};
nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/share/raspberrypi/
mv boot "$out/share/raspberrypi/"
@ -26,5 +26,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/raspberrypi/firmware";
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
maintainers = with maintainers; [ dezgeg ];
broken = stdenvNoCC.isDarwin; # Hash mismatch on source, mystery.
};
}

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

@ -2,9 +2,8 @@
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "5.10.92";
tag = "1.20220118";
rev = "650082a559a570d6c9d2739ecc62843d6f951059";
modDirVersion = "5.15.32";
tag = "1.20220331";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
@ -13,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // {
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
inherit rev;
sha256 = "sha256-OSDx9dzqm8JnLUvdiv1aKqhRz80uWqfjXLd7m6ycXME=";
rev = tag;
hash = "sha256-dJtOXe4yvZz/iu0Ly5F9/E/2GbpTJF/9ZMU3rC1nKMw=";
};
defconfig = {

11
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
View file

@ -3,18 +3,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "raspberrypi-eeprom";
version = "2021.12.02";
# From 3fdf703f3f7bbe57eacceada3b558031229a34b0 Mon Sep 17 00:00:00 2001
# From: Peter Harper <peter.harper@raspberrypi.com>
# Date: Mon, 13 Dec 2021 11:56:11 +0000
# Subject: [PATCH] 2021-12-02: Promote the 2021-12-02 beta release to LATEST/STABLE
commit = "3fdf703f3f7bbe57eacceada3b558031229a34b0";
version = "unstable-2022-03-10";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = commit;
sha256 = "sha256-JTL2ziOkT0tnOrOS08ttNtxj3qegsacP73xZBVur7xM=";
rev = "e8927007e3800db3a72100ee6cd38b0d9b687c16";
hash = "sha256-/hn6l5gheh6E3zoANwU1SXYgdry2IjOT9Muw2jkrtCU=";
};
buildInputs = [ python3 ];