diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dda73802e1e0..49bbc5958207 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8204,6 +8204,12 @@ name = "Florian Brandes"; keys = [ { fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; } ]; }; + gaelj = { + name = "Gaƫl James"; + email = "gaeljames@gmail.com"; + github = "gaelj"; + githubId = 8884632; + }; gaelreyrol = { email = "me@gaelreyrol.dev"; matrix = "@Zevran:matrix.org"; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index c9cae817ef92..726aa68b2b64 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,17 +6,18 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.7.3"; + version = "0.8.3"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-COIvnn6qDG9srv4ByWTBoRHfIva3a2dLS+yIZDguo+M="; + hash = "sha256-QIvnGU1BHKsJ/UMcS9zS2v9rn51wKoXvx50rGBIAzm4="; }; pythonRelaxDeps = [ + "aiosql" "aiosqlite" "httpx" "ollama" @@ -33,6 +34,7 @@ python3Packages.buildPythonApplication rec { aiosql aiosqlite httpx + mcp ollama packaging pillow @@ -40,6 +42,7 @@ python3Packages.buildPythonApplication rec { python-dotenv rich-pixels textual + textualeffects typer ]; @@ -53,7 +56,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/ggozad/oterm"; changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ suhr ]; + maintainers = with lib.maintainers; [ gaelj ]; mainProgram = "oterm"; }; } diff --git a/pkgs/development/python-modules/textualeffects/default.nix b/pkgs/development/python-modules/textualeffects/default.nix new file mode 100644 index 000000000000..889c7314859d --- /dev/null +++ b/pkgs/development/python-modules/textualeffects/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + hatchling, + terminaltexteffects, +}: + +buildPythonPackage rec { + pname = "textualeffects"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s6LrsCJu/ubDIXQqxQlY2HVbzDc9+FtUE9oBSulUsm8="; + }; + + build-system = [ hatchling ]; + + dependencies = [ terminaltexteffects ]; + + pythonImportsCheck = [ "textualeffects" ]; + + # no tests implemented + doCheck = false; + + meta = { + description = "Visual effects for Textual, a TerminalTextEffects wrapper"; + homepage = "https://github.com/ggozad/textualeffects"; + changelog = "https://github.com/ggozad/textualeffects/blob/v${version}/CHANGES.txt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gaelj ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 013e7f91fb05..6c8a9c3e0318 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16245,6 +16245,8 @@ self: super: with self; { textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; + textualeffects = callPackage ../development/python-modules/textualeffects { }; + textual-textarea = callPackage ../development/python-modules/textual-textarea { }; testbook = callPackage ../development/python-modules/testbook { };