From 295b03780caa349d63389568727c1a0c4c43d45c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 1 Feb 2025 20:56:50 +0100 Subject: [PATCH 1/2] python312Packages.rns: cleanup --- .../python-modules/rns/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 82e72af1446c..89dccd77fdb8 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -1,15 +1,21 @@ { lib, - bleak, buildPythonPackage, - cryptography, - esptool, fetchFromGitHub, + replaceVars, + esptool, + + # build-system + setuptools, + + # dependencies + bleak, + cryptography, netifaces, pyserial, - pythonOlder, - replaceVars, - setuptools, + + # tests + versionCheckHook, }: buildPythonPackage rec { @@ -17,8 +23,6 @@ buildPythonPackage rec { version = "0.9.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "markqvist"; repo = "Reticulum"; @@ -41,17 +45,20 @@ buildPythonPackage rec { pyserial ]; - # Module has no tests - doCheck = false; - pythonImportsCheck = [ "RNS" ]; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/rncp"; + versionCheckProgramArg = [ "--version" ]; + + meta = { description = "Cryptography-based networking stack for wide-area networks"; - homepage = "https://github.com/markqvist/Reticulum"; - changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + homepage = "https://reticulum.network"; + changelog = "https://github.com/markqvist/Reticulum/blob/${version}/Changelog.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab qbit ]; From 2bcf5954c2409064f15764fe4b8342883fe3e26f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 31 Jan 2025 23:14:37 +0100 Subject: [PATCH 2/2] rns: init at 0.9.1 --- pkgs/by-name/rn/rns/package.nix | 1 + 1 file changed, 1 insertion(+) create mode 100644 pkgs/by-name/rn/rns/package.nix diff --git a/pkgs/by-name/rn/rns/package.nix b/pkgs/by-name/rn/rns/package.nix new file mode 100644 index 000000000000..2392ffa84691 --- /dev/null +++ b/pkgs/by-name/rn/rns/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication rns