From 6f95ea09266bf64898105d88577311e2fa8ea069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 1/7] textualeffects: init at 0.1.3 textualeffects: integrate code-review comments textualeffects: integrate code-review comments --- .../python-modules/textualeffects/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/textualeffects/default.nix 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 aa133fa125bc..1ab3ea27b453 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16237,6 +16237,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 { }; From cc43fcb822a3616af4f5d3deb86cf40d0d3d16b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 2/7] oterm: fix runtime error: missing textualeffects (#366021) --- pkgs/by-name/ot/oterm/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index c9cae817ef92..fa2d2a68036c 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec { python-dotenv rich-pixels textual + textualeffects typer ]; From 2439cd293aaef13649e90aea869dd884e99bab75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 3/7] maintainers: add gaelj --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) 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"; From 49bdffa7151f4a69758a36286a7d6bbd224b48d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 4/7] oterm: assign gaelj as maintainer --- pkgs/by-name/ot/oterm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index fa2d2a68036c..bb998fba57ce 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -54,7 +54,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"; }; } From 47a98549697263e82475b06fbaa240f1bbf99ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:29 +0100 Subject: [PATCH 5/7] oterm: 0.7.3 -> 0.8.0 --- pkgs/by-name/ot/oterm/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index bb998fba57ce..bfa58eeb2bbd 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.7.3"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-COIvnn6qDG9srv4ByWTBoRHfIva3a2dLS+yIZDguo+M="; + hash = "sha256-YKzC7GzRMFQ3zuVrbsiKCW9o8iCAR3PzSYP1ufRspDQ="; }; pythonRelaxDeps = [ @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { aiosql aiosqlite httpx + mcp ollama packaging pillow From f8a5af2c61adde372256194b4ef27f5dd71b41b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:29 +0100 Subject: [PATCH 6/7] oterm: 0.8.0 -> 0.8.1 --- pkgs/by-name/ot/oterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index bfa58eeb2bbd..f923bcba7d05 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-YKzC7GzRMFQ3zuVrbsiKCW9o8iCAR3PzSYP1ufRspDQ="; + hash = "sha256-JE9WgAtCDksfVq17LIDdfvjR9IW02vkH2JhY7eLOgF0="; }; pythonRelaxDeps = [ From 264fbf0c768df8b24d42b7e9ffbfceb8285c9c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:29 +0100 Subject: [PATCH 7/7] oterm: 0.8.1 -> 0.8.3 --- pkgs/by-name/ot/oterm/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index f923bcba7d05..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.8.1"; + version = "0.8.3"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-JE9WgAtCDksfVq17LIDdfvjR9IW02vkH2JhY7eLOgF0="; + hash = "sha256-QIvnGU1BHKsJ/UMcS9zS2v9rn51wKoXvx50rGBIAzm4="; }; pythonRelaxDeps = [ + "aiosql" "aiosqlite" "httpx" "ollama"