diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index cef7660d63eb..523da7030662 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -1,20 +1,20 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, fetchpatch +, stdenv , appdirs +, buildPythonPackage +, fetchFromGitHub , lxml , packaging , py , pytestCheckHook +, pythonOlder +, termcolor , wireshark-cli -, stdenv }: buildPythonPackage rec { pname = "pyshark"; - version = "0.5.3"; + version = "0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,32 +23,34 @@ buildPythonPackage rec { owner = "KimiNewt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-byll2GWY2841AAf8Xh+KfaCOtMGVKabTsLCe3gCdZ1o="; + hash = "sha256-kzJDzUK6zknUyXPdKc4zMvWim4C5NQCSJSS45HI6hKM="; }; - patches = [ - (fetchpatch { - name = "fix-mapping.patch"; - url = - "https://github.com/KimiNewt/pyshark/pull/608/commits/c2feb17ef621390481d6acc29dbf807d6851ed4c.patch"; - hash = "sha256-TY09HPxqJP3zI8+ugm518aMuBgog7wrXs5uoReHHaEI="; - }) - ]; - # `stripLen` does not seem to work here patchFlags = [ "-p2" ]; sourceRoot = "${src.name}/src"; # propagate wireshark, so pyshark can find it when used - propagatedBuildInputs = [ appdirs py lxml packaging wireshark-cli ]; + propagatedBuildInputs = [ + appdirs + lxml + packaging + py + termcolor + wireshark-cli + ]; + + nativeCheckInputs = [ + py + pytestCheckHook + wireshark-cli + ]; preCheck = '' export HOME=$(mktemp -d) ''; - nativeCheckInputs = [ py pytestCheckHook wireshark-cli ]; - disabledTests = [ # flaky # KeyError: 'Packet of index 0 does not exist in capture' @@ -59,14 +61,18 @@ buildPythonPackage rec { "test_iterate_empty_psml_capture" ]; - pythonImportsCheck = [ "pyshark" ]; + pythonImportsCheck = [ + "pyshark" + ]; - pytestFlagsArray = [ "../tests/" ]; + pytestFlagsArray = [ + "../tests/" + ]; meta = with lib; { - description = - "Python wrapper for tshark, allowing Python packet parsing using Wireshark dissectors"; + description = "Python wrapper for tshark, allowing Python packet parsing using Wireshark dissectors"; homepage = "https://github.com/KimiNewt/pyshark/"; + changelog = "https://github.com/KimiNewt/pyshark/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; };