diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/ansible')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/ansible/core.nix | 19 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/ansible/default.nix | 6 |
2 files changed, 19 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 0e4aef282a27..241e9cbd034f 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -1,9 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, pythonRelaxDepsHook , installShellFiles , ansible , cryptography +, importlib-resources , jinja2 , junit-xml , lxml @@ -24,11 +27,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.0"; + version = "2.15.2"; src = fetchPypi { inherit pname version; - hash = "sha256-z2kP1Ou0BZDgDFrNwGJHWMpMWNHksrAuwCagNAcOv00="; + hash = "sha256-hCUbAB8vnAkUvu3/zxlSnnRaExCBWdH+J96eOmpjrFo="; }; # ansible_connection is already wrapped, so don't pass it through @@ -41,6 +44,8 @@ buildPythonPackage rec { nativeBuildInputs = [ installShellFiles + ] ++ lib.optionals (pythonOlder "3.10") [ + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -64,7 +69,15 @@ buildPythonPackage rec { requests scp xmltodict - ] ++ lib.optional windowsSupport pywinrm; + ] ++ lib.optionals windowsSupport [ + pywinrm + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ]; + + pythonRelaxDeps = lib.optionals (pythonOlder "3.10") [ + "importlib-resources" + ]; postInstall = '' installManPage docs/man/man1/*.1 diff --git a/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/nixpkgs/pkgs/development/python-modules/ansible/default.nix index c4a355d64850..7a61364ca7a4 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -20,17 +20,17 @@ let pname = "ansible"; - version = "7.2.0"; + version = "8.1.0"; in buildPythonPackage { inherit pname version; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; + hash = "sha256-kfILW/z18phTPBdKk4geALyea0FBFGT0TAVKONcWpWo="; }; postPatch = '' |