From 79bb3ad9047901e121669ac95172546bafbca543 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 30 Jul 2021 16:50:18 -0700
Subject: [PATCH 1/2] rpiboot-unstable: unstable-2020-10-20 -> 2021.07.01

---
 pkgs/development/misc/rpiboot/unstable.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix
index d0cb663fb74b..941c7ce904ef 100644
--- a/pkgs/development/misc/rpiboot/unstable.nix
+++ b/pkgs/development/misc/rpiboot/unstable.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, libusb1 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "rpiboot";
-  version = "unstable-2020-10-20";
+  version = "2021.07.01";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "usbboot";
-    rev = "d3760e119385a179765f43a50a8e051a44127c25";
-    sha256 = "0vygzh2h27xplqp1x4isj6kgrgmvmvc1mr3ghmsi98kzp91w772r";
+    rev = "v${version}";
+    sha256 = "sha256-BkNyYCrasfiRs7CbJa7tCo2k70TLGcXkOX+zGPyZGGE=";
   };
 
   nativeBuildInputs = [ libusb1 ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/raspberrypi/usbboot";
-    description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB";
+    description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB";
     license = licenses.asl20;
     maintainers = with maintainers; [ cartr ];
     platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ];

From 1a182deb8c3c656a14875c6a56c710ae640c41a2 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 30 Jul 2021 16:50:30 -0700
Subject: [PATCH 2/2] rpiboot-unstable -> rpiboot

---
 pkgs/development/misc/rpiboot/{unstable.nix => default.nix} | 0
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/development/misc/rpiboot/{unstable.nix => default.nix} (100%)

diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/default.nix
similarity index 100%
rename from pkgs/development/misc/rpiboot/unstable.nix
rename to pkgs/development/misc/rpiboot/default.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 85a63f37802b..d50316d2a40c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -711,6 +711,7 @@ mapAliases ({
   radare2-cutter = cutter; # added 2021-03-30
   redkite = throw "redkite was archived by upstream"; # added 2021-04-12
   rkt = throw "rkt was archived by upstream"; # added 2020-05-16
+  rpiboot-unstable = rpiboot; # added 2021-07-30
   ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
   ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby";
   ruby_2_2_9 = throw "ruby_2_2_9 was deprecated on 2018-02-13: use a newer version of ruby";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d3e5fafb151..eaec5e11d81d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8567,7 +8567,7 @@ in
 
   rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { };
 
-  rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { };
+  rpiboot = callPackage ../development/misc/rpiboot { };
 
   rpm = callPackage ../tools/package-management/rpm {
     python = python3;