commit fd27107002697c1cbfa693a573797a67c086111d · pyrox.dev/nixpkgs

+18 -8

pkgs/development/python-modules/webssh/default.nix

···

       5
       5
        
         fetchPypi,

     

       6
       6
        
         paramiko,

     

       7
       7
        
         pytestCheckHook,

     

       8
       8
       +
         setuptools,

     

       8
       9
        
         tornado,

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       buildPythonPackage rec {

     

       12
       13
        
         pname = "webssh";

     

       13
       14
        
         version = "1.6.3";

     

       14
       14
       -
         format = "setuptools";

     

       15
       15
       +
         pyproject = true;

     

       15
       16
        
       

     

       16
       17
        
         src = fetchPypi {

     

       17
       18
        
           inherit pname version;

     

       18
       19
        
           hash = "sha256-K85buvIGrTRZEMfk3IAks8QY5oHJ9f8JjxgCvv924QA=";

     

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       21
       -
         patches = [

     

       22
       22
       -
           ./remove-typo-in-test-case.patch

     

       23
       23
       -
         ];

     

       22
       22
       +
         build-system = [ setuptools ];

     

       24
       23
        
       

     

       25
       25
       -
         propagatedBuildInputs = [

     

       24
       24
       +
         dependencies = [

     

       26
       25
        
           paramiko

     

       27
       26
        
           tornado

     

       28
       27
        
         ];

     
···

       31
       30
        
       

     

       32
       31
        
         pythonImportsCheck = [ "webssh" ];

     

       33
       32
        
       

     

       34
       34
       -
         meta = with lib; {

     

       33
       33
       +
         disabledTests = [

     

       34
       34
       +
           # https://github.com/huashengdun/webssh/issues/412

     

       35
       35
       +
           "test_get_pkey_obj_with_encrypted_ed25519_key"

     

       36
       36
       +
           "test_get_pkey_obj_with_encrypted_new_rsa_key"

     

       37
       37
       +
           "test_get_pkey_obj_with_plain_new_dsa_key"

     

       38
       38
       +
           # BrokenPipeError: [Errno 32] Broken pipe

     

       39
       39
       +
           "test_app_post_form_with_large_body_size_by_multipart_form"

     

       40
       40
       +
           "test_app_post_form_with_large_body_size_by_urlencoded_form"

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         __darwinAllowLocalNetworking = true;

     

       44
       44
       +
       

     

       45
       45
       +
         meta = {

     

       35
       46
        
           description = "Web based SSH client";

     

       36
       47
        
           mainProgram = "wssh";

     

       37
       48
        
           homepage = "https://github.com/huashengdun/webssh/";

     

       38
       49
        
           changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}";

     

       39
       39
       -
           license = licenses.mit;

     

       50
       50
       +
           license = lib.licenses.mit;

     

       40
       51
        
           maintainers = [ ];

     

       41
       41
       -
           broken = stdenv.hostPlatform.isDarwin;

     

       42
       52
        
         };

     

       43
       53
        
       }

-18

pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch

···

       1
       1
       -
       ---

     

       2
       2
       -
        tests/test_handler.py | 2 +-

     

       3
       3
       -
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       4
       4
       -
       

     

       5
       5
       -
       diff --git a/tests/test_handler.py b/tests/test_handler.py

     

       6
       6
       -
       index a9ad924..950e672 100644

     

       7
       7
       -
       --- a/tests/test_handler.py

     

       8
       8
       -
       +++ b/tests/test_handler.py

     

       9
       9
       -
       @@ -336,5 +336,5 @@ class TestIndexHandler(unittest.TestCase):

     

       10
       10
       -
                ssh.exec_command.return_value = (stdin, stdout, stderr)

     

       11
       11
       -
        

     

       12
       12
       -
                encoding = IndexHandler.get_default_encoding(handler, ssh)

     

       13
       13
       -
       -        self.assertEquals("utf-8", encoding)

     

       14
       14
       -
       +        self.assertEqual("utf-8", encoding)

     

       15
       15
       -
        

     

       16
       16
       -
       -- 

     

       17
       17
       -
       2.44.0

     

       18
       18
       -