From c27c4e60b219ca13e789dcb318a06129d003360a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jun 2024 09:15:52 +0200 Subject: [PATCH 1/5] python312Packages.textual: 0.53.1 -> 0.65.1 Diff: https://github.com/Textualize/textual/compare/refs/tags/v0.53.1...v0.65.1 Changelog: https://github.com/Textualize/textual/releases/tag/v0.65.1 --- pkgs/development/python-modules/textual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 859f3508e3a4..df7642da4940 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.53.1"; + version = "0.65.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-73qEogHe69B66r4EJOj2RAP95O5z7v/UYARTIEPxrcA="; + hash = "sha256-pB2IKiMxSKbZWChPhvvyrzDo1Bo/fvnSIrtrSOrwJtQ="; }; build-system = [ poetry-core ]; From 475e3c538c44634a92bb153e94ca644d14dbd124 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 09:36:30 +0200 Subject: [PATCH 2/5] python312Packages.rich-pixels: 2.2.0 -> 3.0.1 Diff: https://github.com/darrenburns/rich-pixels/compare/refs/tags/2.2.0...3.0.1 Changelog: https://github.com/darrenburns/rich-pixels/releases/tag/refs/tags/3.0.1 --- .../python-modules/rich-pixels/default.nix | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix index f54d5bb66eb9..cda87a534fc4 100644 --- a/pkgs/development/python-modules/rich-pixels/default.nix +++ b/pkgs/development/python-modules/rich-pixels/default.nix @@ -3,49 +3,42 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - poetry-core, - pytestCheckHook, - syrupy, + hatchling, pillow, - rich, + pytestCheckHook, + pythonOlder, pythonRelaxDepsHook, + rich, + syrupy, }: buildPythonPackage rec { pname = "rich-pixels"; - version = "2.2.0"; - format = "pyproject"; + version = "3.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "darrenburns"; repo = "rich-pixels"; - rev = version; - hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c="; + rev = "refs/tags/${version}"; + hash = "sha256-Sqs0DOyxJBfZmm/SVSTMSmaaeRlusiSp6VBnJjKYjgQ="; }; - patches = [ - (fetchpatch { - name = "fix-version.patch"; - url = "https://github.com/darrenburns/rich-pixels/commit/ff1cc3fef789321831f29e9bf282ae6b337eddb2.patch"; - hash = "sha256-58ZHBNg1RCuOfuE034qF1SbAgoiWMNlSG3c5pCSLUyI="; - }) - ]; + pythonRelaxDeps = [ "pillow" ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ hatchling ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ syrupy ]; - - propagatedBuildInputs = [ + dependencies = [ pillow rich ]; - pythonRelaxDeps = [ "pillow" ]; + nativeCheckInputs = [ + pytestCheckHook + syrupy + ]; pythonImportsCheck = [ "rich_pixels" ]; From 317340ce68765066bc0b82568be0910c9f3303c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 09:41:07 +0200 Subject: [PATCH 3/5] oterm: 0.2.8 -> 0.2.9 Changelog: https://github.com/ggozad/oterm/releases/tag/0.2.9 --- pkgs/by-name/ot/oterm/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 12d096690e34..9651b8d9cf3b 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.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; rev = "refs/tags/${version}"; - hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk="; + hash = "sha256-UOZxktgpuTxkE1+DVnd5T1Fye+2SS2hUDmWtCaGEol0="; }; pythonRelaxDeps = [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { "ollama" "packaging" "pillow" + "textual" "typer" ]; @@ -29,7 +30,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ aiohttp aiosql aiosqlite @@ -54,7 +55,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/ggozad/oterm"; changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; license = lib.licenses.mit; - mainProgram = "oterm"; maintainers = with lib.maintainers; [ suhr ]; + mainProgram = "oterm"; }; } From 6ce9e91371b49a54d43411124f7222b4c049525c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 09:55:03 +0200 Subject: [PATCH 4/5] python312Packages.textual-dev: disable tests Tests require a running textual WS server --- .../python-modules/textual-dev/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index 41fcf67a5404..0e2b1c4884be 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -6,11 +6,8 @@ fetchFromGitHub, msgpack, poetry-core, - pytest-aiohttp, - pytestCheckHook, pythonOlder, textual, - time-machine, typing-extensions, }: @@ -28,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-QnMKVt1WxnwGnZFNb7Gbus7xewGvyG5xJ0hIKKK5hug="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp click msgpack @@ -38,19 +35,17 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ - pytest-aiohttp - pytestCheckHook - time-machine - ]; + # Tests require a running textual WS server + doCheck = false; pythonImportsCheck = [ "textual_dev" ]; meta = with lib; { description = "Development tools for Textual"; - mainProgram = "textual"; homepage = "https://github.com/Textualize/textual-dev"; + changelog = "https://github.com/Textualize/textual-dev/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ yannip ]; + mainProgram = "textual"; }; } From dd455254a80044ad1c9c36754b166592a835be78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 09:58:34 +0200 Subject: [PATCH 5/5] python312Packages.textual: 0.65.1 -> 0.68.0 Diff: https://github.com/Textualize/textual/compare/refs/tags/v0.65.1...v0.68.0 Changelog: https://github.com/Textualize/textual/releases/tag/v0.68.0 --- pkgs/development/python-modules/textual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index df7642da4940..c6a677f4c65a 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.65.1"; + version = "0.68.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-pB2IKiMxSKbZWChPhvvyrzDo1Bo/fvnSIrtrSOrwJtQ="; + hash = "sha256-nxQVxe7lXMcxyqh4SWcQ/A6eQcEzkSshKmpweHpn7JE="; }; build-system = [ poetry-core ];