From 836724ed64a6fff73cec192949418bcd656d1668 Mon Sep 17 00:00:00 2001
From: Bradley Cooley <bradley.cooley@xiantinc.com>
Date: Mon, 10 Feb 2025 08:36:33 -0700
Subject: [PATCH 1/2] maintainers: add bcooley

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dda73802e1e0..6a9daff96cd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2747,6 +2747,12 @@
     githubId = 34620799;
     name = "Jacob Bachmann";
   };
+  bcooley = {
+    email = "bradley.m.cooley@gmail.com";
+    github = "Bradley-Cooley";
+    githubId = 5409401;
+    name = "Bradley Cooley";
+  };
   bcyran = {
     email = "bazyli@cyran.dev";
     github = "bcyran";

From 1fcccc40f272fa4f645a0298e40c4f35ac41b90e Mon Sep 17 00:00:00 2001
From: Bradley Cooley <bradley.cooley@xiantinc.com>
Date: Mon, 10 Feb 2025 08:37:22 -0700
Subject: [PATCH 2/2] vscode-extensions.marus25.cortex-debug: init at 1.6.10

Release: https://github.com/Marus/cortex-debug/releases/tag/v1.6.10
---
 .../editors/vscode/extensions/default.nix      |  2 ++
 .../marus25.cortex-debug/default.nix           | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4ca91ebe85bf..a0b59e0362a9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3126,6 +3126,8 @@ let
         };
       };
 
+      marus25.cortex-debug = callPackage ./marus25.cortex-debug { };
+
       matangover.mypy = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "mypy";
diff --git a/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix
new file mode 100644
index 000000000000..e0fcee449198
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix
@@ -0,0 +1,18 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "cortex-debug";
+    publisher = "marus25";
+    version = "1.6.10";
+    hash = "sha256-6b3JDkX6Xd91VE1h7gYyeukxLsBkn/nNzDQgBm0axRA=";
+  };
+  meta = {
+    changelog = "https://marketplace.visualstudio.com/items/marus25.cortex-debug/changelog";
+    description = "Visual Studio Code extension for enhancing debug capabilities for Cortex-M Microcontrollers";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug";
+    homepage = "https://github.com/Marus/cortex-debug";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.bcooley ];
+  };
+}