From f585dd79ae46584080b44cbeead4eb7af4f6bc7a Mon Sep 17 00:00:00 2001 From: Jorrit van der Heide Date: Fri, 5 Dec 2025 09:23:43 +0100 Subject: [PATCH] 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;