commit dd20053acd8ba14cc7b258ef1f3e8cd0b9f78c27 · pyrox.dev/nixpkgs

+9 -11

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

···

       7
        
         fetchpatch,

     

       8
        
         lxml,

     

       9
        
         packaging,

     

       10
       -
         py,

     

       11
        
         pytestCheckHook,

     

       12
       -
         pythonOlder,

     

       0
        
       
     

       13
        
         termcolor,

     

       14
        
         wireshark-cli,

     

       15
        
       }:

     
···

       17
        
       buildPythonPackage rec {

     

       18
        
         pname = "pyshark";

     

       19
        
         version = "0.6";

     

       20
       -
         format = "setuptools";

     

       21
       -
       

     

       22
       -
         disabled = pythonOlder "3.7";

     

       23
        
       

     

       24
        
         src = fetchFromGitHub {

     

       25
        
           owner = "KimiNewt";

     
···

       37
        
             url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch";

     

       38
        
             hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g=";

     

       39
        
           })

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
         ];

     

       41
        
       

     

       42
        
         sourceRoot = "${src.name}/src";

     

       43
        
       

     

       44
       -
         # propagate wireshark, so pyshark can find it when used

     

       45
       -
         propagatedBuildInputs = [

     

       0
        
       
     

       46
        
           appdirs

     

       47
        
           lxml

     

       48
        
           packaging

     

       49
       -
           py

     

       50
        
           termcolor

     

       51
       -
           wireshark-cli

     

       52
        
         ];

     

       53
        
       

     

       54
        
         nativeCheckInputs = [

     

       55
       -
           py

     

       56
        
           pytestCheckHook

     

       57
       -
           wireshark-cli

     

       58
        
         ];

     

       59
        
       

     

       60
        
         preCheck = ''

···

       7
        
         fetchpatch,

     

       8
        
         lxml,

     

       9
        
         packaging,

     

       0
        
       
     

       10
        
         pytestCheckHook,

     

       11
       +
         replaceVars,

     

       12
       +
         setuptools,

     

       13
        
         termcolor,

     

       14
        
         wireshark-cli,

     

       15
        
       }:

     
···

       17
        
       buildPythonPackage rec {

     

       18
        
         pname = "pyshark";

     

       19
        
         version = "0.6";

     

       20
       +
         pyproject = true;

     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "KimiNewt";

     
···

       35
        
             url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch";

     

       36
        
             hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g=";

     

       37
        
           })

     

       38
       +
           (replaceVars ./hardcode-tshark-path.patch {

     

       39
       +
             tshark = lib.getExe' wireshark-cli "tshark";

     

       40
       +
           })

     

       41
        
         ];

     

       42
        
       

     

       43
        
         sourceRoot = "${src.name}/src";

     

       44
        
       

     

       45
       +
         build-system = [ setuptools ];

     

       46
       +
       

     

       47
       +
         dependencies = [

     

       48
        
           appdirs

     

       49
        
           lxml

     

       50
        
           packaging

     

       0
        
       
     

       51
        
           termcolor

     

       0
        
       
     

       52
        
         ];

     

       53
        
       

     

       54
        
         nativeCheckInputs = [

     

       0
        
       
     

       55
        
           pytestCheckHook

     

       0
        
       
     

       56
        
         ];

     

       57
        
       

     

       58
        
         preCheck = ''

+30

pkgs/development/python-modules/pyshark/hardcode-tshark-path.patch

···

       1
       +
       diff --git a/src/pyshark/tshark/tshark.py b/src/pyshark/tshark/tshark.py

     

       2
       +
       index 73ede9d..17c0488 100644

     

       3
       +
       --- a/src/pyshark/tshark/tshark.py

     

       4
       +
       +++ b/src/pyshark/tshark/tshark.py

     

       5
       +
       @@ -47,24 +47,7 @@ def get_process_path(tshark_path=None, process_name="tshark"):

     

       6
       +
                                                f"{process_name}.exe" if sys.platform.startswith("win") else process_name)

     

       7
       +
                possible_paths.insert(0, user_tshark_path)

     

       8
       +
        

     

       9
       +
       -    # Windows search order: configuration file"s path, common paths.

     

       10
       +
       -    if sys.platform.startswith("win"):

     

       11
       +
       -        for env in ("ProgramFiles(x86)", "ProgramFiles"):

     

       12
       +
       -            program_files = os.getenv(env)

     

       13
       +
       -            if program_files is not None:

     

       14
       +
       -                possible_paths.append(

     

       15
       +
       -                    os.path.join(program_files, "Wireshark", f"{process_name}.exe")

     

       16
       +
       -                )

     

       17
       +
       -    # Linux, etc. search order: configuration file's path, the system's path

     

       18
       +
       -    else:

     

       19
       +
       -        os_path = os.getenv(

     

       20
       +
       -            "PATH",

     

       21
       +
       -            "/usr/bin:/usr/sbin:/usr/lib/tshark:/usr/local/bin"

     

       22
       +
       -        )

     

       23
       +
       -        for path in os_path.split(":"):

     

       24
       +
       -            possible_paths.append(os.path.join(path, process_name))

     

       25
       +
       -    if sys.platform.startswith("darwin"):

     

       26
       +
       -        possible_paths.append(f"/Applications/Wireshark.app/Contents/MacOS/{process_name}")

     

       27
       +
       +    possible_paths.append("@tshark@")

     

       28
       +
        

     

       29
       +
            for path in possible_paths:

     

       30
       +
                if os.path.exists(path):