From 20d2900dd5eeff4b06f757abdffe3300e217a548 Mon Sep 17 00:00:00 2001
From: Jorrit van der Heide <bw20@noreply.codeberg.org>
Date: Fri, 5 Dec 2025 09:15:22 +0100
Subject: [PATCH 1/4] fix: meshcore version in flake

---
 flake.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 97013a7..e0168a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,12 +15,12 @@
 
         meshcore = python3Packages.buildPythonPackage rec {
           pname = "meshcore";
-          version = "2.2.1";
+          version = "2.2.2";
           pyproject = true;
 
           src = python3Packages.fetchPypi {
             inherit pname version;
-            sha256 = "sha256-HpCbGG+ZQdVWIeE3mJFFQ7w5W+JjcNb+Tb53i9uT5CA=";
+            sha256 = "sha256-vn/vF4avMDwDLL0EMVrrMWkZrZ1GTiUxGyTBOtKvG1I=";
           };
 
           build-system = [python3Packages.hatchling];

From f585dd79ae46584080b44cbeead4eb7af4f6bc7a Mon Sep 17 00:00:00 2001
From: Jorrit van der Heide <bw20@noreply.codeberg.org>
Date: Fri, 5 Dec 2025 09:23:43 +0100
Subject: [PATCH 2/4] fix: get meshcore_ppy from GitHub

---
 flake.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index e0168a1..21c9a3f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,9 +4,11 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
-  outputs = inputs:
+  outputs =
+    inputs:
     inputs.flake-utils.lib.eachDefaultSystem (
-      system: let
+      system:
+      let
         pkgs = inputs.nixpkgs.legacyPackages.${system};
 
         lib = pkgs.lib;
@@ -15,15 +17,17 @@
 
         meshcore = python3Packages.buildPythonPackage rec {
           pname = "meshcore";
-          version = "2.2.2";
+          version = "2.2.1";
           pyproject = true;
 
-          src = python3Packages.fetchPypi {
-            inherit pname version;
-            sha256 = "sha256-vn/vF4avMDwDLL0EMVrrMWkZrZ1GTiUxGyTBOtKvG1I=";
+          src = pkgs.fetchFromGitHub {
+            owner = "meshcore-dev";
+            repo = "meshcore_py";
+            rev = "v${version}";
+            sha256 = "sha256-Qjwi7JrSyk5wWM63OdFykB850+hquWDD9p4fZFfbI70=";
           };
 
-          build-system = [python3Packages.hatchling];
+          build-system = [ python3Packages.hatchling ];
 
           dependencies = [
             python3Packages.bleak
@@ -31,12 +35,13 @@
             python3Packages.pyserial-asyncio
           ];
 
-          pythonImportsCheck = ["meshcore"];
+          pythonImportsCheck = [ "meshcore" ];
         };
 
         pyproject = lib.importTOML ./pyproject.toml;
         version = pyproject.project.version;
-      in {
+      in
+      {
         packages.meshcore-cli = python3Packages.buildPythonPackage {
           pname = "meshcore-cli";
           inherit version;
@@ -57,7 +62,7 @@
             python3Packages.prompt_toolkit
             python3Packages.pyserial
             python3Packages.requests
-			python3Packages.pycryptodome
+            python3Packages.pycryptodome
           ];
 
           doCheck = false;

From 2b9dbf17361696363ba0970fa257c4a3bf774629 Mon Sep 17 00:00:00 2001
From: Jorrit van der Heide <bw20@noreply.codeberg.org>
Date: Fri, 5 Dec 2025 09:24:01 +0100
Subject: [PATCH 3/4] fix: revert meshcore version back to 2.2.1

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 951e202..e96f65a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ classifiers = [
 ]
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
-dependencies = [ "meshcore >= 2.2.2",
+dependencies = [ "meshcore >= 2.2.1",
 				 "bleak >= 0.22, <2.0", 
 				 "prompt_toolkit >= 3.0.50", 
 				 "requests >= 2.28.0", 

From 4f0aae0715a99204e3bdba3ed9d8dfd001abd7b8 Mon Sep 17 00:00:00 2001
From: Jorrit van der Heide <bw20@noreply.codeberg.org>
Date: Fri, 5 Dec 2025 11:47:04 +0100
Subject: [PATCH 4/4] fix: restore to v2.2.2

---
 flake.nix      | 10 ++++------
 pyproject.toml |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 21c9a3f..e412052 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,14 +17,12 @@
 
         meshcore = python3Packages.buildPythonPackage rec {
           pname = "meshcore";
-          version = "2.2.1";
+          version = "2.2.2";
           pyproject = true;
 
-          src = pkgs.fetchFromGitHub {
-            owner = "meshcore-dev";
-            repo = "meshcore_py";
-            rev = "v${version}";
-            sha256 = "sha256-Qjwi7JrSyk5wWM63OdFykB850+hquWDD9p4fZFfbI70=";
+          src = python3Packages.fetchPypi {
+            inherit pname version;
+            sha256 = "sha256-vn/vF4avMDwDLL0EMVrrMWkZrZ1GTiUxGyTBOtKvG1I=";
           };
 
           build-system = [ python3Packages.hatchling ];
diff --git a/pyproject.toml b/pyproject.toml
index e96f65a..951e202 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ classifiers = [
 ]
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
-dependencies = [ "meshcore >= 2.2.1",
+dependencies = [ "meshcore >= 2.2.2",
 				 "bleak >= 0.22, <2.0", 
 				 "prompt_toolkit >= 3.0.50", 
 				 "requests >= 2.28.0",