BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #268280 from peat-psuwit/for-upstream/upgrade-linux-rpi

Browse source
This commit is contained in:
Bernardo Meurer 2024-01-14 15:34:19 -05:00 committed by GitHub
commit 3ea621c7ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,22 +2,22 @@
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "raspberrypi-wireless-firmware"; pname = "raspberrypi-wireless-firmware";
version = "unstable-2023-05-04"; version = "unstable-2023-11-15";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
name = "bluez-firmware"; name = "bluez-firmware";
owner = "RPi-Distro"; owner = "RPi-Distro";
repo = "bluez-firmware"; repo = "bluez-firmware";
rev = "9556b08ace2a1735127894642cc8ea6529c04c90"; rev = "d9d4741caba7314d6500f588b1eaa5ab387a4ff5";
hash = "sha256-gKGK0XzNrws5REkKg/JP6SZx3KsJduu53SfH3Dichkc="; hash = "sha256-CjbZ3t3TW/iJ3+t9QKEtM9NdQU7SwcUCDYuTmFEwvhU=";
}) })
(fetchFromGitHub { (fetchFromGitHub {
name = "firmware-nonfree"; name = "firmware-nonfree";
owner = "RPi-Distro"; owner = "RPi-Distro";
repo = "firmware-nonfree"; repo = "firmware-nonfree";
rev = "2b465a10b04555b7f45b3acb85959c594922a3ce"; rev = "88aa085bfa1a4650e1ccd88896f8343c22a24055";
hash = "sha256-9UgB8f2AaxG7S5Px46jOP9wUeO1VXKB0uJiPWh32oDI="; hash = "sha256-Yynww79LPPkau4YDSLI6IMOjH64nMpHUdGjnCfIR2+M=";
}) })
]; ];
@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation {
cp -rv "$NIX_BUILD_TOP/firmware-nonfree/debian/config/brcm80211/." "$out/lib/firmware/" cp -rv "$NIX_BUILD_TOP/firmware-nonfree/debian/config/brcm80211/." "$out/lib/firmware/"
# Bluetooth firmware # Bluetooth firmware
cp -rv "$NIX_BUILD_TOP/bluez-firmware/broadcom/." "$out/lib/firmware/brcm" cp -rv "$NIX_BUILD_TOP/bluez-firmware/debian/firmware/broadcom/." "$out/lib/firmware/brcm"
# brcmfmac43455-stdio.bin is a symlink to the non-existent path: ../cypress/cyfmac43455-stdio.bin. # brcmfmac43455-stdio.bin is a symlink to the non-existent path: ../cypress/cyfmac43455-stdio.bin.
# See https://github.com/RPi-Distro/firmware-nonfree/issues/26 # See https://github.com/RPi-Distro/firmware-nonfree/issues/26
@ -43,8 +43,6 @@ stdenvNoCC.mkDerivation {
pushd $out/lib/firmware/brcm &>/dev/null pushd $out/lib/firmware/brcm &>/dev/null
# Symlinks for Zero 2W # Symlinks for Zero 2W
ln -s "./brcmfmac43436-sdio.bin" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin"
ln -s "./brcmfmac43436-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt"
ln -s "./brcmfmac43436-sdio.clm_blob" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.clm_blob" ln -s "./brcmfmac43436-sdio.clm_blob" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.clm_blob"
popd &>/dev/null popd &>/dev/null

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

@ -3,13 +3,16 @@
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.20230405"; # raspberrypi/firmware no longers tag the releases. However, since each commit
# on the stable branch corresponds to a tag in raspberrypi/linux repo, we
# assume they are cut together.
version = "stable_20231123";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = version; rev = "524247ac6d8b1f4ddd53730e978a70c76a320bd6";
hash = "sha256-UtUd1MbsrDFxd/1C3eOAMDKPZMx+kSMFYOJP+Kc6IU8="; hash = "sha256-rESwkR7pc5MTwIZ8PaMUPXuzxfv+jVpdRp8ijvxHGcg=";
}; };
installPhase = '' installPhase = ''

6
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 = "6.1.21"; modDirVersion = "6.1.63";
tag = "1.20230405"; tag = "stable_20231123";
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 = tag; rev = tag;
hash = "sha256-ILwecHZ1BN6GhZAUB6/UwiN/rZ8gHndKON6DUhidtxI="; hash = "sha256-4Rc57y70LmRFwDnOD4rHoHGmfxD9zYEAwYm9Wvyb3no=";
}; };
defconfig = { defconfig = {