diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index bc71e3721288..907cf155ea10 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -7,6 +7,7 @@ , libusb1 , mock , pyasn1 +, pythonAtLeast , pycryptodome , pytestCheckHook , rsa @@ -15,15 +16,15 @@ buildPythonPackage rec { pname = "adb-shell"; version = "0.4.2"; + format = "setuptools"; disabled = !isPy3k; - # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY="; + hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY="; }; propagatedBuildInputs = [ @@ -40,7 +41,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "adb_shell" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # Tests are failing with Python 3.10 + # https://github.com/JeffLIrion/adb_shell/issues/198 + "TestAdbDeviceAsync" + "TestTcpTransportAsync" + ]; + + pythonImportsCheck = [ + "adb_shell" + ]; meta = with lib; { description = "Python implementation of ADB with shell and FileSync functionality";