From 8a4a84ec587f5bdb1856c5c522fec81a8f2c06d1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 2 Aug 2021 17:34:17 -0700 Subject: [PATCH 01/11] raspberrypifw: 1.20210303 -> 1.20210727 --- 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 6a826f63966..f9cf5326a76 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.20210303"; + version = "1.20210727"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m"; + sha256 = "sha256-Iwgmsd49eSIrxAtjLnCWdcmCRpXkhHWOQJZwUgnSY3w="; }; installPhase = '' From bcbdce8947e98ef4ff0b9af854cc8e2b90775043 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 2 Aug 2021 17:38:39 -0700 Subject: [PATCH 02/11] linux_rpi{0,1,2,3,4}: 5.10.17 -> 5.10.52 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 8ccf46b402b..6a4f98c32d7 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.17"; - tag = "1.20210303"; + modDirVersion = "5.10.52"; + tag = "1.20210727"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -12,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // { src = fetchFromGitHub { owner = "raspberrypi"; repo = "linux"; - rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx"; + rev = tag; + sha256 = "0nabl547y75n1yx4584gidlhfv3ajzgbxcrkfa5sb04jwj0d469k"; }; defconfig = { @@ -33,6 +33,11 @@ lib.overrideDerivation (buildLinux (args // { # | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush') DRM_AST n + # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_commit_tail': + # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7757:4: error: implicit declaration of function 'is_hdr_metadata_different' [-Werror=implicit-function-declaration] + # 7757 | is_hdr_metadata_different(old_con_state, new_con_state); + # | ^~~~~~~~~~~~~~~~~~~~~~~~~ + DRM_AMDGPU n ''; extraMeta = if (rpiVersion < 3) then { From 91c0fe2cd985836d386fab30fb3744587e0bead7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 2 Aug 2021 17:35:28 -0700 Subject: [PATCH 03/11] raspberrypiWirelessFirmware: 2021-01-28 -> 2021-06-28 --- .../linux/firmware/raspberrypi-wireless/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index e6a03ef7df5..6ab9648a669 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2021-01-28"; + version = "2021-06-28"; srcs = [ (fetchFromGitHub { @@ -16,8 +16,8 @@ stdenv.mkDerivation { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5"; - sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp"; + rev = "00de3194a96397c913786945ac0af1fd6fbec45b"; + sha256 = "1xnr364dkiq6gmr21lcrj23hwc0g9y5qad8dm2maij647bgzp07r"; }) ]; From f4dcb9768e8df21a392a25930f3d57e25a4c70d9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 2 Aug 2021 17:36:20 -0700 Subject: [PATCH 04/11] raspberrypi-armstubs: 2020-10-08 -> 2021-07-05 --- pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 52fa4266577..6a477459c5c 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "raspberrypi-armstubs"; - version = "2020-10-08"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "tools"; - rev = "fc0e73c13865450e95edd046200e42a6e52d8256"; - sha256 = "1g6ikpjcrm5x0rk5aiwjdd8grf997qkvgamcrdxy6k9ln746h25s"; + rev = "2e59fc67d465510179155973d2b959e50a440e47"; + sha256 = "1ysdl4qldy6ldf8cm1igxjisi14xl3s2pi6cnqzpxb38sgihb1vy"; }; NIX_CFLAGS_COMPILE = [ From 171fc534a7d5d6962c35dc897453c498b1bd044e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 2 Aug 2021 17:37:31 -0700 Subject: [PATCH 05/11] libraspberrypi: unstable-2021-03-17 -> unstable-2021-06-23 --- 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 8a8f41981aa..a0b959d178f 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-03-17"; + version = "unstable-2021-06-23"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615"; - sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a"; + rev = "97bc8180ad682b004ea224d1db7b8e108eda4397"; + sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5"; }; patches = [ From 852454a96c3158a09cc27ce3030d8fa2a54b213c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 2 Aug 2021 18:52:55 -0700 Subject: [PATCH 06/11] raspberrypiWirelessFirmware: run pre/post hooks in installPhase --- .../os-specific/linux/firmware/raspberrypi-wireless/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 6ab9648a669..ba8df751511 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { dontFixup = true; installPhase = '' + runHook preInstall mkdir -p "$out/lib/firmware/brcm" # Wifi firmware @@ -37,6 +38,7 @@ stdenv.mkDerivation { # Bluetooth firmware cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm" + runHook postInstall ''; outputHashMode = "recursive"; From e828b6b4311c7ea78093154f2f218effb80f7671 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 Aug 2021 10:03:07 -0700 Subject: [PATCH 07/11] raspberrypi-armstubs: don't use URI literals in meta --- pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 6a477459c5c..d1257186a62 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Firmware related ARM stubs for the Raspberry Pi"; - homepage = https://github.com/raspberrypi/tools; + homepage = "https://github.com/raspberrypi/tools"; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ samueldr ]; From b59ab5263dd97d569c74e9e4d20bc5fd2dc93ac9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 Aug 2021 10:04:05 -0700 Subject: [PATCH 08/11] raspberrypi-armstubs: run pre/post hooks in installPhase --- pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index d1257186a62..890a816b26f 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -37,8 +37,10 @@ stdenv.mkDerivation { ; installPhase = '' + runHook preInstall mkdir -vp $out/ cp -v *.bin $out/ + runHook postInstall ''; meta = with lib; { From f00890056ac76275d2a1352c6dec32c866d9fa09 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 Aug 2021 10:03:35 -0700 Subject: [PATCH 09/11] raspberrypi-armstubs: remove unused arguments --- pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 890a816b26f..9934f51487d 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub }: let inherit (lib) optionals; From ca4a093c32319a736a85bd2bd53f9595dacca3a1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 6 Aug 2021 10:40:45 -0700 Subject: [PATCH 10/11] raspberrypifw: 1.20210727 -> 1.20210805 --- 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 f9cf5326a76..29c1859121e 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.20210727"; + version = "1.20210805"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "sha256-Iwgmsd49eSIrxAtjLnCWdcmCRpXkhHWOQJZwUgnSY3w="; + sha256 = "1nndhjv4il42yw3pq8ni3r4nlp1m0r229fadrf4f9v51mgcg11i1"; }; installPhase = '' From c181d9965cc6c5d912a5b0c5d0fcc8ba6447c814 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 6 Aug 2021 10:41:10 -0700 Subject: [PATCH 11/11] linux_rpi{0,1,2,3,4}: 1.20210727 -> 1.20210805 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 6a4f98c32d7..17d24c187d5 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -3,7 +3,7 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this modDirVersion = "5.10.52"; - tag = "1.20210727"; + tag = "1.20210805"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = tag; - sha256 = "0nabl547y75n1yx4584gidlhfv3ajzgbxcrkfa5sb04jwj0d469k"; + sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b"; }; defconfig = {