From 37fbf3de41c5343a00f64d87e76f5ee607d6a6ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 05:39:36 +0200 Subject: [PATCH 1/4] linux_rpi: 5.10.11 -> 5.10.17 --- 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 373984298cca..8ccf46b402b7 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.10.11"; - tag = "1.20210201"; + modDirVersion = "5.10.17"; + tag = "1.20210303"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "0n4zq47k9bmkgmarrhwvivp10v5ga8y2bphsx0il3kmcpf0c1m3q"; + sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx"; }; defconfig = { From f209fb76c6b76182dd9d94064062efa1bff46d6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 05:54:38 +0200 Subject: [PATCH 2/4] libraspberrypi: unstable-2021-01-11 -> unstable-2021-03-17 --- pkgs/development/libraries/libraspberrypi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 532800ddd96a..d4d69ed6afff 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2021-01-11"; + version = "unstable-2021-03-17"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "4a0a19b88b43e48c6b51b526b9378289fb712a4c"; - sha256 = "0g3a1a7w717h0fwk39banzgjwphh62fx64k130w2s5885lsn5r5k"; + rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615"; + sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a"; }; patches = [ From 10abcde053177e2fcb1b3579f5955e54d286349c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 05:54:58 +0200 Subject: [PATCH 3/4] raspberrypi-eeprom: 2021-01-11 -> 2021-03-18 --- pkgs/os-specific/linux/raspberrypi-eeprom/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index b0fd6b354b90..90af44f83530 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation { pname = "raspberrypi-eeprom"; - version = "2021-01-11"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "54cadc816ba739afd08ead6d679e647de028a65c"; - sha256 = "0zlacr4z6h40h0g47195xsbss29gaa7kf8r31h372sxsn8srlnjf"; + rev = "ff27ccf69403b01e337fc4ee6e7ae75244028cce"; + sha256 = "1q1vlld0xxh9zinf5g0qa6jw1dggq93br938mvrfx3nb2aviiwcj"; }; buildInputs = [ python3 ]; @@ -28,7 +28,6 @@ stdenvNoCC.mkDerivation { cp rpi-eeprom-config rpi-eeprom-update $out/bin cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom - cp -r firmware/vl805 $out/bin ''; fixupPhase = '' From c067f62fb95d4accb6a58c153e1cf1dde2f36bf4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 05:55:24 +0200 Subject: [PATCH 4/4] raspberrypifw: 1.20210201 -> 1.20210303 --- 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 8a19e6b8584c..7e0c48a439d7 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.20210201"; + version = "1.20210303"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0frmsixzy9nd8nfg15jsz037522h4gq1hca666cyaf9zg2sa1i7i"; + sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m"; }; installPhase = ''