From 435c50e2963b8655a11ace25c92ec835efb22dbf Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 31 Aug 2025 16:00:41 +0400 Subject: [PATCH] python3Packages.webssh: fix build --- .../python-modules/webssh/default.nix | 26 +++++++++++++------ .../webssh/remove-typo-in-test-case.patch | 18 ------------- 2 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index ae4043556e20..858f46195257 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -5,24 +5,23 @@ fetchPypi, paramiko, pytestCheckHook, + setuptools, tornado, }: buildPythonPackage rec { pname = "webssh"; version = "1.6.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-K85buvIGrTRZEMfk3IAks8QY5oHJ9f8JjxgCvv924QA="; }; - patches = [ - ./remove-typo-in-test-case.patch - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ paramiko tornado ]; @@ -31,13 +30,24 @@ buildPythonPackage rec { pythonImportsCheck = [ "webssh" ]; - meta = with lib; { + disabledTests = [ + # https://github.com/huashengdun/webssh/issues/412 + "test_get_pkey_obj_with_encrypted_ed25519_key" + "test_get_pkey_obj_with_encrypted_new_rsa_key" + "test_get_pkey_obj_with_plain_new_dsa_key" + # BrokenPipeError: [Errno 32] Broken pipe + "test_app_post_form_with_large_body_size_by_multipart_form" + "test_app_post_form_with_large_body_size_by_urlencoded_form" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { description = "Web based SSH client"; mainProgram = "wssh"; homepage = "https://github.com/huashengdun/webssh/"; changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch b/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch deleted file mode 100644 index ac7bd94e5b39..000000000000 --- a/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- - tests/test_handler.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_handler.py b/tests/test_handler.py -index a9ad924..950e672 100644 ---- a/tests/test_handler.py -+++ b/tests/test_handler.py -@@ -336,5 +336,5 @@ class TestIndexHandler(unittest.TestCase): - ssh.exec_command.return_value = (stdin, stdout, stderr) - - encoding = IndexHandler.get_default_encoding(handler, ssh) -- self.assertEquals("utf-8", encoding) -+ self.assertEqual("utf-8", encoding) - --- -2.44.0 -