Merge pull request #199908 from gador/linux-rpi4-5.15.74

authored by Bernardo Meurer and committed by GitHub 3ec797ef 0b0a8153

+5 -5
+2 -2
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
··· 3 stdenvNoCC.mkDerivation rec { 4 # NOTE: this should be updated with linux_rpi 5 pname = "raspberrypi-firmware"; 6 - version = "1.20220331"; 7 8 src = fetchFromGitHub { 9 owner = "raspberrypi"; 10 repo = "firmware"; 11 rev = version; 12 - hash = "sha256-TxlpHPEJAtVJTtDghuJpx2mLjEPiKkcAr7S9Cd/cocE="; 13 }; 14 15 installPhase = ''
··· 3 stdenvNoCC.mkDerivation rec { 4 # NOTE: this should be updated with linux_rpi 5 pname = "raspberrypi-firmware"; 6 + version = "1.20221028"; 7 8 src = fetchFromGitHub { 9 owner = "raspberrypi"; 10 repo = "firmware"; 11 rev = version; 12 + hash = "sha256-GgPAWFCrLrrLiUDM+pt3VV6+IvCljMN9nh7L84vTQJs="; 13 }; 14 15 installPhase = ''
+3 -3
pkgs/os-specific/linux/kernel/linux-rpi.nix
··· 2 3 let 4 # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this 5 - modDirVersion = "5.15.32"; 6 - tag = "1.20220331"; 7 in 8 lib.overrideDerivation (buildLinux (args // { 9 version = "${modDirVersion}-${tag}"; ··· 13 owner = "raspberrypi"; 14 repo = "linux"; 15 rev = tag; 16 - hash = "sha256-dJtOXe4yvZz/iu0Ly5F9/E/2GbpTJF/9ZMU3rC1nKMw="; 17 }; 18 19 defconfig = {
··· 2 3 let 4 # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this 5 + modDirVersion = "5.15.74"; 6 + tag = "1.20221028"; 7 in 8 lib.overrideDerivation (buildLinux (args // { 9 version = "${modDirVersion}-${tag}"; ··· 13 owner = "raspberrypi"; 14 repo = "linux"; 15 rev = tag; 16 + hash = "sha256-2UdSW9X9prAya9mvEp3i0l3Uim0wtDYEY0WrD2wntaI="; 17 }; 18 19 defconfig = {