diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 3d143bfb2b3d..f0ddee2357f5 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2025.1"; + version = "2025.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pSiynGnOixgqM3hyxfBGBx9taNNBXG179TvSfCZPWNA="; + hash = "sha256-t8JFx1MceSZDYSYgqoErleyAoi/Q5nveTYRzRpLcS3I="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pytest-pudb/default.nix b/pkgs/development/python-modules/pytest-pudb/default.nix index 5ccaf27b3abc..cdf3ca59194c 100644 --- a/pkgs/development/python-modules/pytest-pudb/default.nix +++ b/pkgs/development/python-modules/pytest-pudb/default.nix @@ -28,10 +28,12 @@ buildPythonPackage { pythonImportsCheck = [ "pytest_pudb" ]; - meta = with lib; { + meta = { + # https://github.com/wronglink/pytest-pudb/issues/28 + broken = lib.versionAtLeast pytest.version "8.4.0"; description = "Pytest PuDB debugger integration"; homepage = "https://github.com/wronglink/pytest-pudb"; - license = licenses.mit; - maintainers = with maintainers; [ thornycrackers ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thornycrackers ]; }; } diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix index 3b88fda29ef9..b4d0226588db 100644 --- a/pkgs/development/python-modules/recline/default.nix +++ b/pkgs/development/python-modules/recline/default.nix @@ -20,15 +20,6 @@ buildPythonPackage rec { sha256 = "sha256-WBMt5jDPCBmTgVdYDN662uU2HVjB1U3GYJwn0P56WsI="; }; - patches = [ - # based on https://github.com/NetApp/recline/pull/21 - ./devendor.patch - ]; - - postPatch = '' - rm -r recline/vendor/argcomplete - ''; - build-system = [ setuptools ]; dependencies = [ argcomplete ]; diff --git a/pkgs/development/python-modules/recline/devendor.patch b/pkgs/development/python-modules/recline/devendor.patch deleted file mode 100644 index de54e203d356..000000000000 --- a/pkgs/development/python-modules/recline/devendor.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 6ea5c039671de2547249c36ca3e1fb51fc4a7e06 -Author: Sandro Jäckel -Date: Thu Feb 6 18:33:28 2025 +0100 - - Devendor argcomplete - -diff --git a/pyproject.toml b/pyproject.toml -index 5ac5cab..6b60188 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -21,6 +21,7 @@ packages = [ - ] - - [tool.poetry.dependencies] -+argcomplete = "*" - python = ">=3.9.0,<4" - windows-curses = {version = "^2.3.3", markers = "sys_platform == 'win32'"} - pyreadline3 = {version = "^3.4.1", markers = "sys_platform == 'win32'"} -diff --git a/recline/repl/completer.py b/recline/repl/completer.py -index ff35583..1a05ae3 100644 ---- a/recline/repl/completer.py -+++ b/recline/repl/completer.py -@@ -5,6 +5,7 @@ - as argument names and values. - """ - -+import argcomplete - import argparse - import re - import readline -@@ -12,7 +13,6 @@ - - import recline - from recline.arg_types.recline_type import UniqueParam --from recline.vendor import argcomplete - - - def match_command_hook(substitution, matches, *_):