From ac983b702d1b0e3c732dd57e43d192355fa122cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 27 Mar 2024 19:35:31 +0100 Subject: [PATCH 1/2] ansible: add extraPackages option --- pkgs/development/python-modules/ansible/core.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 3edaca820b27..2b635f5160b0 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + python, pythonOlder, installShellFiles, docutils, @@ -25,6 +26,8 @@ windowsSupport ? false, pywinrm, xmltodict, + # Additional packages to add to dependencies + extraPackages ? _: [ ], }: buildPythonPackage rec { @@ -88,7 +91,8 @@ buildPythonPackage rec { scp xmltodict ] - ++ lib.optionals windowsSupport [ pywinrm ]; + ++ lib.optionals windowsSupport [ pywinrm ] + ++ extraPackages python.pkgs; pythonRelaxDeps = [ "resolvelib" ]; From c9d7e1665f68862538e72c8cee629483ab01fee4 Mon Sep 17 00:00:00 2001 From: Stanislav Asunkin <1353637+stasjok@users.noreply.github.com> Date: Tue, 17 May 2022 11:18:31 +0300 Subject: [PATCH 2/2] ansible: add jmespath by default --- pkgs/development/python-modules/ansible/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index cf4e89c49075..d66d8958aac1 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchPypi, setuptools, + jmespath, jsonschema, jxmlease, ncclient, @@ -63,6 +64,10 @@ buildPythonPackage { xmltodict # ansible.windows + # Default ansible collections dependencies + # community.general + jmespath + # lots of collections with dedicated requirements.txt and pyproject.toml files, # add the dependencies for the collections you need conditionally and install # ansible using overrides to enable the collections you need.