From 2f31ae59e735111abd8c935d82256031e30c98af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:05:09 +0200 Subject: [PATCH 1/5] python312Packages.rns: 0.7.4 -> 0.7.5 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.7.4...0.7.5 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.7.5 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 6c3c582b2b0e..bc7f88d5dc59 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-M6iI554lv6PF5sIdOoaMIlQHP5YU8WM8YxfHMWhLSdE="; + hash = "sha256-TWaDRJQ695kjoKjWQeAO+uxSZGgQiHoWYIsS+XnYVOQ="; }; build-system = [ setuptools ]; From 6614648648b0a7c1a254ac7455e2751bb57e6274 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:05:48 +0200 Subject: [PATCH 2/5] python312Packages.nomadnet: 0.4.8 -> 0.4.9 Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.4.8...0.4.9 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.4.9 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index d7548d3f8bd8..b51cf436da3e 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-a8fLfTJePf+pejDTqYNXCZda24LaNtOwxwEmEMAnB0I="; + hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; }; nativeBuildInputs = [ From 684d72bf1a5a9816acc918cd7408680bf82755ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:06:47 +0200 Subject: [PATCH 3/5] python312Packages.nomadnet: refactor --- pkgs/development/python-modules/nomadnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index b51cf436da3e..6c5c1dafd20c 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ rns lxmf urwid @@ -43,10 +43,10 @@ buildPythonPackage rec { meta = with lib; { description = "Off-grid, resilient mesh communication"; - mainProgram = "nomadnet"; homepage = "https://github.com/markqvist/NomadNet"; changelog = "https://github.com/markqvist/NomadNet/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "nomadnet"; }; } From 9211484ec35e956b8ecb8bfcfbf2534525db478c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:07:05 +0200 Subject: [PATCH 4/5] python312Packages.nomadnet: format with nixfmt --- .../python-modules/nomadnet/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 6c5c1dafd20c..6ffc0da4c30f 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, lxmf -, pythonOlder -, qrcode -, rns -, setuptools -, urwid +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxmf, + pythonOlder, + qrcode, + rns, + setuptools, + urwid, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ rns @@ -37,9 +36,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "nomadnet" - ]; + pythonImportsCheck = [ "nomadnet" ]; meta = with lib; { description = "Off-grid, resilient mesh communication"; From ac9dc2867f88e0440c7c7e42d6ec3f86ed23ec7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:07:56 +0200 Subject: [PATCH 5/5] python312Packages.lmxf: format with nixfmt --- .../python-modules/lxmf/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 6682b2b09f64..4e4147fc1bb0 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, rns -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + rns, + setuptools, }: buildPythonPackage rec { @@ -20,20 +21,14 @@ buildPythonPackage rec { hash = "sha256-8Usu2fecSnyVfGrEJED4qMBO5RwJjTq5c7svCTu445Q="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - rns - ]; + dependencies = [ rns ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "LXMF" - ]; + pythonImportsCheck = [ "LXMF" ]; meta = with lib; { description = "Lightweight Extensible Message Format for Reticulum";