diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index a56b9690bec2..d988f69683ec 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -1,25 +1,23 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# pythonPackages , anyconfig , appdirs +, buildPythonPackage , colorama , environs +, fetchFromGitHub , jinja2 , jsonschema , nested-lookup , pathspec , poetry-core , python-json-logger +, pythonOlder , ruamel-yaml }: buildPythonPackage rec { pname = "ansible-doctor"; - version = "1.2.4"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,39 +26,41 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = "ansible-doctor"; rev = "v${version}"; - hash = "sha256-e0FmV4U96TSC/dYJlgo5AeLdXQ7Z7rrP4JCtBxJdkhU="; + hash = "sha256-lJKJE9UccknQg8aqt/6qmjKKaICBxaCH5e8fdmie6u8="; }; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + anyconfig + appdirs + colorama + environs + jinja2 + jsonschema + nested-lookup + pathspec + python-json-logger + ruamel-yaml + ]; + postInstall = '' rm $out/lib/python*/site-packages/LICENSE ''; postPatch = '' substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \ --replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \ --replace 'environs = "9.5.0"' 'environs = "*"' \ --replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \ --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' ''; - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - jinja2 - colorama - python-json-logger - pathspec - environs - jsonschema - appdirs - ruamel-yaml - anyconfig - nested-lookup - ]; - - # no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e780640be541..adf953593ae3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14706,6 +14706,8 @@ with pkgs; ansible = ansible_2_12; ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor; + ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix {