diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 7f51ccac6a72..33f74d932465 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -1,28 +1,32 @@ -{ lib, stdenv -, buildPythonPackage -, fetchFromGitHub +{ lib +, stdenv , aiohttp +, buildPythonPackage , eventlet +, fetchFromGitHub , iana-etc , libredirect , mock +, pytestCheckHook +, pythonOlder , requests , six , tornado , websocket-client -, websockets -, pytestCheckHook }: buildPythonPackage rec { pname = "python-engineio"; - version = "4.2.1"; + version = "4.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-aAoTeQZCtxddVBPwlyv2j4aACMO9p0vQ/ESkkv4E3VE="; + sha256 = "sha256-ohNRtceh0bHBlnGSFUckG5KzoLY8Q1jvpFee7T78Vto="; }; checkInputs = [ @@ -32,7 +36,6 @@ buildPythonPackage rec { requests tornado websocket-client - websockets pytestCheckHook ]; @@ -43,11 +46,19 @@ buildPythonPackage rec { export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so ''; - postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; # somehow effective log level does not change? - disabledTests = [ "test_logger" ]; - pythonImportsCheck = [ "engineio" ]; + disabledTests = [ + "test_logger" + ]; + + pythonImportsCheck = [ + "engineio" + ]; meta = with lib; { description = "Python based Engine.IO client and server"; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 5a672b2dec64..cd41899c5810 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp , bidict , buildPythonPackage , fetchFromGitHub @@ -6,22 +7,31 @@ , msgpack , pytestCheckHook , python-engineio +, pythonOlder +, requests +, websocket-client }: buildPythonPackage rec { pname = "python-socketio"; - version = "5.4.0"; + version = "5.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-0Q1R8XPciU5AEkj7Exlc906eyA5juYKzzA/Ygnzx7XU="; + sha256 = "sha256-qmC7AL2ZNB0D5p3c8ozacNMKc2COzYzPJfz6KXwWsd0="; }; propagatedBuildInputs = [ + aiohttp bidict python-engineio + requests + websocket-client ]; checkInputs = [ @@ -30,7 +40,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "socketio" ]; + pythonImportsCheck = [ + "socketio" + ]; meta = with lib; { description = "Python Socket.IO server and client";