diff --git a/overlays/reticulum.nix b/overlays/reticulum.nix index e0818a0..49f0bf5 100644 --- a/overlays/reticulum.nix +++ b/overlays/reticulum.nix @@ -1,88 +1,86 @@ final: prev: let - inherit (final.lib) optionalAttrs; python3 = final.python3; pyPkgs = python3.pkgs; -in { - reticulumStack = python3.pkgs.buildPythonApplication rec { - pname = "reticulum"; - version = "1.2.9"; - format = "setuptools"; - src = pyPkgs.fetchPypi { - pname = "rns"; - inherit version; - sha256 = "554814231c237b9caacf8df669312e57dd7d3f84b6d4810125087d1a79a75d75"; +in + { + reticulumStack = python3.pkgs.buildPythonApplication rec { + pname = "reticulum"; + version = "1.2.9"; + format = "setuptools"; + src = pyPkgs.fetchPypi { + pname = "rns"; + inherit version; + sha256 = "554814231c237b9caacf8df669312e57dd7d3f84b6d4810125087d1a79a75d75"; + }; + propagatedBuildInputs = with pyPkgs; [ cryptography pyserial ]; + doCheck = false; + pythonImportsCheck = [ "RNS" ]; + meta = with final.lib; { + description = "Self-configuring, encrypted and resilient mesh networking stack"; + homepage = "https://reticulum.network/"; + license = licenses.mit; + platforms = platforms.linux; + }; }; - propagatedBuildInputs = with pyPkgs; [ cryptography pyserial ]; - doCheck = false; - pythonImportsCheck = [ "RNS" ]; - meta = with final.lib; { - description = "Self-configuring, encrypted and resilient mesh networking stack"; - homepage = "https://reticulum.network/"; - license = licenses.mit; - platforms = platforms.linux; - }; - }; - lxmf = python3.pkgs.buildPythonApplication rec { - pname = "lxmf"; - version = "0.9.8"; - format = "setuptools"; - src = pyPkgs.fetchPypi { - inherit pname version; - sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c"; + lxmf = python3.pkgs.buildPythonApplication rec { + pname = "lxmf"; + version = "0.9.8"; + format = "setuptools"; + src = pyPkgs.fetchPypi { + inherit pname version; + sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c"; + }; + propagatedBuildInputs = [ final.reticulumStack ]; + doCheck = false; + pythonImportsCheck = [ "LXMF" ]; + meta = with final.lib; { + description = "Lightweight Extensible Message Format for Reticulum"; + homepage = "https://github.com/markqvist/lxmf"; + license = licenses.mit; + platforms = platforms.linux; + }; }; - propagatedBuildInputs = [ final.reticulumStack ]; - doCheck = false; - pythonImportsCheck = [ "LXMF" ]; - meta = with final.lib; { - description = "Lightweight Extensible Message Format for Reticulum"; - homepage = "https://github.com/markqvist/lxmf"; - license = licenses.mit; - platforms = platforms.linux; - }; - }; - nomadnet = python3.pkgs.buildPythonApplication rec { - pname = "nomadnet"; - version = "1.1.1"; - format = "setuptools"; - src = pyPkgs.fetchPypi { - inherit pname version; - sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a"; + nomadnet = python3.pkgs.buildPythonApplication rec { + pname = "nomadnet"; + version = "1.1.1"; + format = "setuptools"; + src = pyPkgs.fetchPypi { + inherit pname version; + sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a"; + }; + propagatedBuildInputs = with pyPkgs; [ final.reticulumStack final.lxmf urwid qrcode ]; + doCheck = false; + pythonImportsCheck = [ "nomadnet" ]; + meta = with final.lib; { + description = "Nomad Network — resilient mesh communications platform"; + homepage = "https://github.com/markqvist/NomadNet"; + license = licenses.mit; + platforms = platforms.linux; + }; }; - propagatedBuildInputs = with pyPkgs; [ final.reticulumStack final.lxmf urwid qrcode ]; - doCheck = false; - pythonImportsCheck = [ "nomadnet" ]; - meta = with final.lib; { - description = "Nomad Network — resilient mesh communications platform"; - homepage = "https://github.com/markqvist/NomadNet"; - license = licenses.mit; - platforms = platforms.linux; - }; - }; - rnsh = python3.pkgs.buildPythonApplication rec { - pname = "rnsh"; - version = "0.1.7"; - format = "setuptools"; - src = pyPkgs.fetchPypi { - inherit pname version; - sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93"; + rnsh = python3.pkgs.buildPythonApplication rec { + pname = "rnsh"; + version = "0.1.7"; + format = "setuptools"; + src = pyPkgs.fetchPypi { + inherit pname version; + sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93"; + }; + propagatedBuildInputs = [ final.reticulumStack ]; + doCheck = false; + pythonImportsCheck = [ "rnsh" ]; + meta = with final.lib; { + description = "Remote shell over Reticulum"; + homepage = "https://github.com/acehoss/rnsh"; + license = licenses.mit; + platforms = platforms.linux; + }; }; - propagatedBuildInputs = [ final.reticulumStack ]; - doCheck = false; - pythonImportsCheck = [ "rnsh" ]; - meta = with final.lib; { - description = "Remote shell over Reticulum"; - homepage = "https://github.com/acehoss/rnsh"; - license = licenses.mit; - platforms = platforms.linux; - }; - }; -} -# meshtastic may not be in all nixpkgs versions (not in 25.11 stable) -// optionalAttrs (builtins.hasAttr "meshtastic" prev) { - meshtastic = prev.meshtastic.overrideAttrs (old: { - dontCheckRuntimeDeps = true; - }); -} + } + # meshtastic may not exist in all nixpkgs versions (e.g. not in 25.11) + // prev.lib.optionalAttrs (prev ? meshtastic) { + inherit (prev) meshtastic; + } \ No newline at end of file