From afe72b6bdfdf65db278398d889940e0ca4bc6d76 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 6 Nov 2022 22:50:39 +0100 Subject: [PATCH 1/2] linux_rpi{1,2,3,4}: 1.20220331 -> 1.20221028 5.15.32 -> 5.15.74 fixes #199828 build failure Signed-off-by: Florian Brandes --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 8654bc432ceb..ef742be0de84 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "5.15.32"; - tag = "1.20220331"; + modDirVersion = "5.15.74"; + tag = "1.20221028"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = tag; - hash = "sha256-dJtOXe4yvZz/iu0Ly5F9/E/2GbpTJF/9ZMU3rC1nKMw="; + hash = "sha256-2UdSW9X9prAya9mvEp3i0l3Uim0wtDYEY0WrD2wntaI="; }; defconfig = { From c02cb0fd58c74b97b3477cd59246e2f344623f80 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 6 Nov 2022 22:52:21 +0100 Subject: [PATCH 2/2] raspberrypi-firmware: 1.20220331 -> 1.20221028 Signed-off-by: Florian Brandes --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 9181a94dcb66..f63d2095eb70 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20220331"; + version = "1.20221028"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - hash = "sha256-TxlpHPEJAtVJTtDghuJpx2mLjEPiKkcAr7S9Cd/cocE="; + hash = "sha256-GgPAWFCrLrrLiUDM+pt3VV6+IvCljMN9nh7L84vTQJs="; }; installPhase = ''