pyrox.dev
Merge pull request #167474 from lovesegfault/update-rpi-pkgs
treewide: update raspberrypi packages
authored by Bernardo Meurer and committed by GitHub 354d21cb 659b91df
+3
-3
pkgs/development/libraries/libraspberrypi/default.nix
+3
-3
pkgs/development/libraries/libraspberrypi/default.nix
···
7
7
8
8
stdenv.mkDerivation rec {
9
9
pname = "libraspberrypi";
10
-
version = "unstable-2021-10-25";
10
+
version = "unstable-2022-03-23";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "raspberrypi";
14
14
repo = "userland";
15
-
rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b";
16
-
sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU=";
15
+
rev = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e";
16
+
hash = "sha256-sAfpfq7C9HXVS7ym3UFIO6bpEIWFCOfVCSN2n5q1RNg=";
17
17
};
18
18
19
19
patches = [
+5
-5
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+5
-5
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
···
2
2
3
3
stdenv.mkDerivation {
4
4
pname = "raspberrypi-wireless-firmware";
5
-
version = "2021-11-02";
5
+
version = "2021-12-06";
6
6
7
7
srcs = [
8
8
(fetchFromGitHub {
···
10
10
owner = "RPi-Distro";
11
11
repo = "bluez-firmware";
12
12
rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";
13
-
sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b";
13
+
hash = "sha256-6xBdXwAGA1N42k1KKYrEgtsxtFAtrwhKdIrYY39Fb7Y=";
14
14
})
15
15
(fetchFromGitHub {
16
16
name = "firmware-nonfree";
17
17
owner = "RPi-Distro";
18
18
repo = "firmware-nonfree";
19
-
rev = "54ffdd6e2ea6055d46656b78e148fe7def3ec9d8";
20
-
sha256 = "4WTrs/tUyOugufRrrh0qsEmhPclQD64ypYysxsnOyS8=";
19
+
rev = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc";
20
+
hash = "sha256-xg6fYQvg7t2ikyLI8/XfpiNaNTf7CNFQlAzpTldTz10=";
21
21
})
22
22
];
23
23
···
44
44
45
45
outputHashMode = "recursive";
46
46
outputHashAlgo = "sha256";
47
-
outputHash = "l+7VOq7CV5QA8/FWjMBGDcxq8Qe7NFf6E2Y42htZEgE=";
47
+
outputHash = "sha256-Fw8EC1jzszWg9rNH01oaOIHnSYDuF6ov6ulmIAPuNz4=";
48
48
49
49
meta = with lib; {
50
50
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";
+8
-7
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+8
-7
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
···
1
-
{ lib, stdenvNoCC, fetchurl, unzip }:
1
+
{ lib, stdenvNoCC, fetchFromGitHub }:
2
2
3
3
stdenvNoCC.mkDerivation rec {
4
4
# NOTE: this should be updated with linux_rpi
5
5
pname = "raspberrypi-firmware";
6
-
version = "1.20220118";
6
+
version = "1.20220331";
7
7
8
-
src = fetchurl {
9
-
url = "https://github.com/raspberrypi/firmware/archive/${version}.zip";
10
-
sha256 = "sha256-98rbwKIuB7vb4MWbFCr7TYsvJB0HzPdH8Tw0+bktK/M=";
8
+
src = fetchFromGitHub {
9
+
owner = "raspberrypi";
10
+
repo = "firmware";
11
+
rev = version;
12
+
hash = "sha256-TxlpHPEJAtVJTtDghuJpx2mLjEPiKkcAr7S9Cd/cocE=";
11
13
};
12
-
13
-
nativeBuildInputs = [ unzip ];
14
14
15
15
installPhase = ''
16
16
mkdir -p $out/share/raspberrypi/
···
26
26
homepage = "https://github.com/raspberrypi/firmware";
27
27
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
28
28
maintainers = with maintainers; [ dezgeg ];
29
+
broken = stdenvNoCC.isDarwin; # Hash mismatch on source, mystery.
29
30
};
30
31
}
+4
-5
pkgs/os-specific/linux/kernel/linux-rpi.nix
+4
-5
pkgs/os-specific/linux/kernel/linux-rpi.nix
···
2
2
3
3
let
4
4
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
5
-
modDirVersion = "5.10.92";
6
-
tag = "1.20220118";
7
-
rev = "650082a559a570d6c9d2739ecc62843d6f951059";
5
+
modDirVersion = "5.15.32";
6
+
tag = "1.20220331";
8
7
in
9
8
lib.overrideDerivation (buildLinux (args // {
10
9
version = "${modDirVersion}-${tag}";
···
13
12
src = fetchFromGitHub {
14
13
owner = "raspberrypi";
15
14
repo = "linux";
16
-
inherit rev;
17
-
sha256 = "sha256-OSDx9dzqm8JnLUvdiv1aKqhRz80uWqfjXLd7m6ycXME=";
15
+
rev = tag;
16
+
hash = "sha256-dJtOXe4yvZz/iu0Ly5F9/E/2GbpTJF/9ZMU3rC1nKMw=";
18
17
};
19
18
20
19
defconfig = {
+3
-8
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
+3
-8
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
···
3
3
}:
4
4
stdenvNoCC.mkDerivation rec {
5
5
pname = "raspberrypi-eeprom";
6
-
version = "2021.12.02";
7
-
# From 3fdf703f3f7bbe57eacceada3b558031229a34b0 Mon Sep 17 00:00:00 2001
8
-
# From: Peter Harper <peter.harper@raspberrypi.com>
9
-
# Date: Mon, 13 Dec 2021 11:56:11 +0000
10
-
# Subject: [PATCH] 2021-12-02: Promote the 2021-12-02 beta release to LATEST/STABLE
11
-
commit = "3fdf703f3f7bbe57eacceada3b558031229a34b0";
6
+
version = "unstable-2022-03-10";
12
7
13
8
src = fetchFromGitHub {
14
9
owner = "raspberrypi";
15
10
repo = "rpi-eeprom";
16
-
rev = commit;
17
-
sha256 = "sha256-JTL2ziOkT0tnOrOS08ttNtxj3qegsacP73xZBVur7xM=";
11
+
rev = "e8927007e3800db3a72100ee6cd38b0d9b687c16";
12
+
hash = "sha256-/hn6l5gheh6E3zoANwU1SXYgdry2IjOT9Muw2jkrtCU=";
18
13
};
19
14
20
15
buildInputs = [ python3 ];