From 9a966e84b6e485c60cde15facffd76ae340b06e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 6 Oct 2020 20:47:01 +0200 Subject: [PATCH] raspberrypifw: 1.20200601 -> 1.20200902 Also disable the fixup phase since it only throws errors and remove the platforms since these are only static files. --- pkgs/os-specific/linux/device-tree/raspberrypi.nix | 2 +- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index 5a0d5710392..93dad5ef327 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; meta = with stdenvNoCC.lib; { - inherit (raspberrypifw.meta) platforms homepage license; + inherit (raspberrypifw.meta) homepage license; description = "DTBs for the Raspberry Pi"; }; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 77a28444636..6036eff2d98 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raspberrypi-firmware"; - version = "1.20200601"; + version = "1.20200902"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "1vm038f9digwg8gdxl2bypzlip3ycjb6bl56274gh5i9abl6wjvf"; + sha256 = "1dj5vyhz2ljka7hwhl6s14hd017fspix1xp7zbm7lzdyys9jb9ni"; }; installPhase = '' @@ -16,11 +16,12 @@ stdenv.mkDerivation rec { cp -R boot/* $out/share/raspberrypi/boot ''; + dontFixup = true; + meta = with stdenv.lib; { description = "Firmware for the Raspberry Pi board"; homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ dezgeg tavyc ]; }; }