diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index dd136f0d7c3c..ec64e2919e29 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -3,7 +3,9 @@ , ansible-core , buildPythonPackage , fetchPypi +, fetchpatch , glibcLocales +, importlib-metadata , mock , openssh , pbr @@ -21,16 +23,25 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.1"; + version = "2.3.3"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y="; + hash = "sha256-OP9jXkuUeR3ilWyB4mWDbsSWWzDp7jXXL88ycdxGuYs="; }; + patches = [ + (fetchpatch { + name = "fix-tests.patch"; + url = "https://github.com/ansible/ansible-runner/commit/0d522c90cfc1f305e118705a1b3335ccb9c1633d.patch"; + hash = "sha256-eTnQkftvjK0YHU+ovotRVSuVlvaVeXp5SvYk1DPCg88="; + excludes = [ ".github/workflows/ci.yml" "tox.ini" ]; + }) + ]; + nativeBuildInputs = [ pbr ]; @@ -42,6 +53,8 @@ buildPythonPackage rec { python-daemon pyyaml six + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; nativeCheckInputs = [ @@ -70,10 +83,6 @@ buildPythonPackage rec { "test_large_stdout_blob" # Failed: DID NOT RAISE "test_validate_pattern" - ] ++ lib.optionals stdenv.isDarwin [ - # test_process_isolation_settings is currently broken on Darwin Catalina - # https://github.com/ansible/ansible-runner/issues/413 - "process_isolation_settings" ]; disabledTestPaths = [