From 13c8727ad89482fb0d0bf02eb43e00c19dc6aa96 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 12 Dec 2023 11:54:24 +0100
Subject: [PATCH 1/3] raspberrypi-eeprom: migrate to by-name

---
 .../default.nix => by-name/ra/raspberrypi-eeprom/package.nix}   | 1 +
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{os-specific/linux/raspberrypi-eeprom/default.nix => by-name/ra/raspberrypi-eeprom/package.nix} (98%)

diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
similarity index 98%
rename from pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
rename to pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index 6cc93b8dd3c6..1cac9e400627 100644
--- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -58,5 +58,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-boot-eeprom";
     license = with licenses; [ bsd3 unfreeRedistributableFirmware ];
     maintainers = with maintainers; [ das_j Luflosi ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567e92887a1d..32a49204031f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28655,8 +28655,6 @@ with pkgs;
   raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { };
   raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { };
 
-  raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom { };
-
   raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { };
 
   reap = callPackage ../os-specific/linux/reap { };

From 7e8102be932defe23e6fde641bbd93729c667f83 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 12 Dec 2023 15:46:05 +0100
Subject: [PATCH 2/3] raspberrypi-eeprom: cleanup

- Move each function argument into its own line for better git diffs in the future
- Use `finalAttrs` instead of `rec`
---
 .../by-name/ra/raspberrypi-eeprom/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index 1cac9e400627..b8f14c5f8a6a 100644
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -1,14 +1,23 @@
-{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper
-, python3, binutils-unwrapped, findutils, gawk, kmod, pciutils, libraspberrypi
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, makeWrapper
+, python3
+, binutils-unwrapped
+, findutils
+, gawk
+, kmod
+, pciutils
+, libraspberrypi
 }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raspberrypi-eeprom";
   version = "2023.10.30-2712";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-eeprom";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-TKvby0qIXidM5Qk7q+ovLk0DpHsCbdQe7xndrgKrSXk=";
   };
 
@@ -60,4 +69,4 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with maintainers; [ das_j Luflosi ];
     platforms = platforms.linux;
   };
-}
+})

From 9845925e52bbace8658f39e5fb692960224b11b7 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 12 Dec 2023 11:52:32 +0100
Subject: [PATCH 3/3] raspberrypi-eeprom: 2023.10.30-2712 -> 2023.12.06-2712

https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2023.12.06-2712
---
 pkgs/by-name/ra/raspberrypi-eeprom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index b8f14c5f8a6a..796010d687ce 100644
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raspberrypi-eeprom";
-  version = "2023.10.30-2712";
+  version = "2023.12.06-2712";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-eeprom";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-TKvby0qIXidM5Qk7q+ovLk0DpHsCbdQe7xndrgKrSXk=";
+    hash = "sha256-bX+WSWj8Lk0S9GgauJsqElur+AAp5JB8LMEstB6aRGo=";
   };
 
   buildInputs = [ python3 ];