From dadbfdb3434d86cc5af6ff6d7466f9c6437e6f11 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:01:09 -0400
Subject: [PATCH 1/5] python3Packages.staticmap3: init at 0.1.0

new dependency for fittrackee
---
 .../python-modules/staticmap3/default.nix     | 60 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/python-modules/staticmap3/default.nix

diff --git a/pkgs/development/python-modules/staticmap3/default.nix b/pkgs/development/python-modules/staticmap3/default.nix
new file mode 100644
index 000000000000..765b2ddc2d87
--- /dev/null
+++ b/pkgs/development/python-modules/staticmap3/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cachecontrol,
+  filelock,
+  mypy,
+  pillow,
+  poetry-core,
+  requests,
+  ruff,
+  types-requests,
+  unittestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "staticmap3";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SamR1";
+    repo = "staticmap";
+    tag = "v${version}";
+    hash = "sha256-SMy4yxHA9Z3BFW6kX8vC7WfsmuZMNqocJ9+dJB6zwSs=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    cachecontrol
+    requests
+    pillow
+  ];
+
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  optional-dependencies = {
+    filecache = [ filelock ];
+    dev = [
+      mypy
+      ruff
+      types-requests
+    ];
+  };
+
+  pythonImportsCheck = [ "staticmap3" ];
+
+  meta = {
+    description = "Small, python-based library for creating map images with lines and markers";
+    homepage = "https://github.com/SamR1/staticmap";
+    changelog = "https://github.com/SamR1/staticmap/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42bc5b547ae8..c5e1e963ae0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16783,6 +16783,8 @@ self: super: with self; {
 
   staticmap = callPackage ../development/python-modules/staticmap { };
 
+  staticmap3 = callPackage ../development/python-modules/staticmap3 { };
+
   staticvectors = callPackage ../development/python-modules/staticvectors { };
 
   statistics = callPackage ../development/python-modules/statistics { };

From 22134f24846848178c9c680a0013992867e4bea0 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 22:19:14 -0400
Subject: [PATCH 2/5] python3packages.fitdecode: init at 0.10.0

Adding as requirement for fittrackee
---
 .../python-modules/fitdecode/default.nix      | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/fitdecode/default.nix

diff --git a/pkgs/development/python-modules/fitdecode/default.nix b/pkgs/development/python-modules/fitdecode/default.nix
new file mode 100644
index 000000000000..26897582c6fa
--- /dev/null
+++ b/pkgs/development/python-modules/fitdecode/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "fitdecode";
+  version = "0.10.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "polyvertex";
+    repo = "fitdecode";
+    tag = "v${version}";
+    hash = "sha256-pW1PgJGqFL2reOYYfpGnQ4WoYFKGMNY8iQJzyHYOly8=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "fitdecode" ];
+
+  meta = {
+    changelog = "https://github.com/polyvertex/fitdecode/blob/${src.tag}/HISTORY.rst";
+    description = "FIT file parsing and decoding library written in Python3";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/polyvertex/fitdecode";
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c5e1e963ae0c..b80cb5bae4d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5021,6 +5021,8 @@ self: super: with self; {
 
   fitbit = callPackage ../development/python-modules/fitbit { };
 
+  fitdecode = callPackage ../development/python-modules/fitdecode { };
+
   fitfile = callPackage ../development/python-modules/fitfile { };
 
   fivem-api = callPackage ../development/python-modules/fivem-api { };

From 88360220fbf88ee292c0e320f61a2d559baddfb7 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:01:56 -0400
Subject: [PATCH 3/5] python3Packages.dramatiq-abort: init at 1.2.1

new dependency for pkgs.fittrackee
---
 .../python-modules/dramatiq-abort/default.nix | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/dramatiq-abort/default.nix

diff --git a/pkgs/development/python-modules/dramatiq-abort/default.nix b/pkgs/development/python-modules/dramatiq-abort/default.nix
new file mode 100644
index 000000000000..165a209f21ee
--- /dev/null
+++ b/pkgs/development/python-modules/dramatiq-abort/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  gevent,
+  pytestCheckHook,
+  pytest-cov,
+  dramatiq,
+  redis,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "dramatiq-abort";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Flared";
+    repo = "dramatiq-abort";
+    tag = "v${version}";
+    hash = "sha256-i5vL9yjQQambG8m6RDByr7/j8+PhDdLsai3pDrH1A4Q=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    dramatiq
+  ];
+
+  optional-dependencies = {
+    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    gevent = [ gevent ];
+    redis = [ redis ];
+  };
+
+  nativeCheckInputs = [
+    redis
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  pythonImportsCheck = [ "dramatiq_abort" ];
+
+  meta = {
+    changelog = "https://github.com/Flared/dramatiq-abort/releases/tag/v${version}";
+    description = "Dramatiq extension to abort message";
+    homepage = "https://github.com/Flared/dramatiq-abort";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b80cb5bae4d7..b661ad82228f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4205,6 +4205,8 @@ self: super: with self; {
 
   dramatiq = callPackage ../development/python-modules/dramatiq { };
 
+  dramatiq-abort = callPackage ../development/python-modules/dramatiq-abort { };
+
   drawille = callPackage ../development/python-modules/drawille { };
 
   drawilleplot = callPackage ../development/python-modules/drawilleplot { };

From a52feb8cf0c53fc77a03aa03e694347c65ace8a6 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:04:08 -0400
Subject: [PATCH 4/5] fittrackee: 0.9.10 -> 0.10.2

https://github.com/SamR1/FitTrackee/releases/tag/v0.9.11

https://github.com/SamR1/FitTrackee/releases/tag/v0.10.0

https://github.com/SamR1/FitTrackee/releases/tag/v0.10.1

https://github.com/SamR1/FitTrackee/releases/tag/v0.10.2
---
 pkgs/by-name/fi/fittrackee/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix
index 08426ae4bccb..a3c857646e63 100644
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@@ -8,14 +8,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "fittrackee";
-  version = "0.9.10";
+  version = "0.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SamR1";
     repo = "FitTrackee";
     tag = "v${version}";
-    hash = "sha256-004M7Uhsl0K8BX19eVU4NrvBeAyUJx/mBlC/R27y9jg=";
+    hash = "sha256-ZCQ4Ft2TSjS62DmGDpQ7gG5Spnf82v82i5nnZtg1UmA=";
   };
 
   build-system = [
@@ -24,9 +24,11 @@ python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "authlib"
+    "flask"
     "flask-limiter"
     "flask-migrate"
     "nh3"
+    "lxml"
     "pyopenssl"
     "pytz"
     "sqlalchemy"
@@ -39,6 +41,8 @@ python3Packages.buildPythonApplication rec {
       babel
       click
       dramatiq
+      dramatiq-abort
+      fitdecode
       flask
       flask-bcrypt
       flask-dramatiq
@@ -56,8 +60,9 @@ python3Packages.buildPythonApplication rec {
       pytz
       shortuuid
       sqlalchemy
-      staticmap
+      staticmap3
       ua-parser
+      xmltodict
     ]
     ++ dramatiq.optional-dependencies.redis
     ++ flask-limiter.optional-dependencies.redis;

From 0fa2fe7bd743db01fa396ac156a0435b603d3db8 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 3 Jun 2025 16:17:09 -0400
Subject: [PATCH 5/5] fittrackee: add tebriel as maintainer

---
 pkgs/by-name/fi/fittrackee/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix
index a3c857646e63..e2500448837a 100644
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@@ -97,6 +97,9 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/SamR1/FitTrackee";
     changelog = "https://github.com/SamR1/FitTrackee/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ traxys ];
+    maintainers = with lib.maintainers; [
+      tebriel
+      traxys
+    ];
   };
 }