diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index a9726c37815c..06eb472ad17c 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -2,8 +2,6 @@ lib, stdenv, aiohttp, - async-timeout, - attrs, buildPythonPackage, cryptography, fetchFromGitHub, @@ -11,22 +9,19 @@ pytest-codspeed, pytestCheckHook, pythonAtLeast, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "snitun"; - version = "0.45.0"; + version = "0.45.1"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "NabuCasa"; repo = "snitun"; tag = version; - hash = "sha256-LAl6En7qMiGeKciY6UIOgtfaCdHqx/T/ohv9vQvk9gE="; + hash = "sha256-luXv5J0PUvW+AGTecwkEq+qkG1N5Ja5NbBKJ3M6HC0I="; }; postPatch = '' @@ -38,8 +33,6 @@ buildPythonPackage rec { dependencies = [ aiohttp - async-timeout - attrs cryptography ]; @@ -49,35 +42,13 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # AssertionError: Expected 'fileno' to not have been called. Called 1 times. - "test_client_stop_no_wait" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" "test_snitun_single_runner_throttling" # ConnectionResetError: [Errno 54] Connection reset by peer "test_peer_listener_timeout" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # blocking - "test_flow_client_peer" - "test_close_client_peer" - "test_init_connector" - "test_flow_connector" - "test_close_connector_remote" - "test_init_connector_whitelist" - "test_init_multiplexer_server" - "test_init_multiplexer_client" - "test_init_multiplexer_server_throttling" - "test_init_multiplexer_client_throttling" - "test_multiplexer_ping" - "test_multiplexer_ping_error" - "test_multiplexer_init_channel_full" - "test_multiplexer_close_channel_full" - "test_init_dual_peer_with_multiplexer" ]; pythonImportsCheck = [ "snitun" ];