From 5dca899b3ac66076fade1a24c37adfb70f32022b Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Mon, 16 Sep 2024 01:18:02 +0100
Subject: [PATCH] flipperzero-firmware: RM0607-1257-0.102.4-a313d17 ->
 RM0914-1058-0.104.1-60485ac

---
 nix/pkgs/flipperzero-firmware/default.nix  | 42 ++++++++++++++++++++++
 nix/pkgs/flipperzero-firmware/version.json | 14 ++++----
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/nix/pkgs/flipperzero-firmware/default.nix b/nix/pkgs/flipperzero-firmware/default.nix
index 0f0e1c7dd5..a897c88123 100644
--- a/nix/pkgs/flipperzero-firmware/default.nix
+++ b/nix/pkgs/flipperzero-firmware/default.nix
@@ -1,5 +1,6 @@
 { depot
 , pkgs ? import <nixpkgs> {}
+, lib ? pkgs.lib
 , ... }:
 
 let
@@ -28,6 +29,45 @@ let
       sha256 = "sha256:1czswx1fj2j48rspkrvarkr43k0vii9rsmz054c9yby1dq362fgr";
     };
   });
+  oslex = pm: pm.buildPythonPackage rec {
+    pname = "oslex";
+    version = "0.1.3";
+    pyproject = true;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "petamas";
+      repo = "oslex";
+      rev = "release/v${version}";
+      hash = "sha256-OcmBtxGS1Cq2kEcxF0Il62LUGbAAcG4lieokr/nK2/4=";
+    };
+
+    nativeBuildInputs = with pm; [
+      hatchling
+      pythonRelaxDepsHook
+    ];
+
+    pythonRemoveDeps = true;
+
+    postPatch = ''
+      substituteInPlace --replace-fail pyproject.toml \
+        '"mslex",' ""
+    '';
+  };
+  cxxheaderparser = pm: pm.buildPythonPackage rec {
+    pname = "cxxheaderparser";
+    version = "1.3.4";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "robotpy";
+      repo = "cxxheaderparser";
+      rev = version;
+      hash = "sha256-Cyo+18mH1p5Zy4dWP3mjZRIkZZOyb61ABedk/amDi0g=";
+    };
+
+    postPatch = ''
+      echo '__version__ = "${version}"' > cxxheaderparser/version.py
+    '';
+  };
   python-with-deps = pkgs.python3.withPackages (pm: with pm; [
     pillow
     (heatshrink2 pm)
@@ -36,6 +76,8 @@ let
     pyserial
     protobuf
     (pm.toPythonModule scons)
+    (oslex pm)
+    (cxxheaderparser pm)
     ansi
     colorlog
     pyelftools
diff --git a/nix/pkgs/flipperzero-firmware/version.json b/nix/pkgs/flipperzero-firmware/version.json
index 70dcd0d263..6899199426 100644
--- a/nix/pkgs/flipperzero-firmware/version.json
+++ b/nix/pkgs/flipperzero-firmware/version.json
@@ -1,16 +1,16 @@
 {
   "src": {
     "url": "https://github.com/RogueMaster/flipperzero-firmware-wPlugins",
-    "rev": "a313d175d5536da553ff6f9bb1ae3a3098508f8e",
-    "date": "2024-06-07T12:50:27-04:00",
-    "path": "/nix/store/dryz4iy2fjdks0iml6s4w23366jqk3gk-flipperzero-firmware-wPlugins-a313d17",
-    "sha256": "19i7n7s931l1ndsbdzawc45ri0g6rz6g1n2h11x3c5r54100pccl",
-    "hash": "sha256-lLELQCAlFzZ6CFDY8MzP5oGYC2Fc/bZ0s4GGkfSxJ6Y=",
+    "rev": "60485ac996da9c812b08b3be9850a133ec66ef74",
+    "date": "2024-09-14T10:57:55-04:00",
+    "path": "/nix/store/hn90pqfhhj54zdz2nb6cdp8c86z4181j-flipperzero-firmware-wPlugins-60485ac",
+    "sha256": "0yzhic9j549sncs706qhkx74q4d2b91kzc7iri52lgi1vc8j9ql0",
+    "hash": "sha256-gOIkEdshPipKzPGwP0NaohFMTp8QG3A0szqRIhOL8Hs=",
     "fetchLFS": false,
     "fetchSubmodules": true,
     "deepClone": false,
     "leaveDotGit": false
   },
-  "version": "RM0607-1257-0.102.4-a313d17",
-  "upstreamVersion": "0.102.4"
+  "version": "RM0914-1058-0.104.1-60485ac",
+  "upstreamVersion": "0.104.1"
 }