From 96bbead009d3de0eac5ff7b394cc30c95b84d7fc Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 11 Jul 2025 21:50:41 +0800 Subject: [PATCH] ansible-doctor: 2.0.4 -> 7.0.8 --- pkgs/by-name/an/ansible-doctor/package.nix | 47 ++++++++++------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 40ca46b861da..8bf83fc95f20 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -1,57 +1,54 @@ { lib, + stdenv, + python3Packages, fetchFromGitHub, - fetchpatch, - python3, + versionCheckHook, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "2.0.4"; - format = "pyproject"; + version = "7.0.8"; + pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; - rev = "refs/tags/v${version}"; - hash = "sha256-nZv1PdR0kGrke2AjcDWjDWBdsw64UpHYFNDFAe/UoJo="; + tag = "v${version}"; + hash = "sha256-BwmmAd1mmyGQ5QQo6uS3+JmPP9kmZe2OOBDNAKFqEl0="; }; - patches = [ - # https://github.com/thegeeklab/ansible-doctor/pull/541 - (fetchpatch { - name = "poetry-dynamic-versioning-pep517.patch"; - url = "https://github.com/thegeeklab/ansible-doctor/commit/b77ba9dccaef4b386bd54b128136c948665eb61a.patch"; - hash = "sha256-XfdTkRk9B857V5DQnxlbwxTb098YwHzKGzNQBTQzWCM="; - }) - ]; - - pythonRelaxDeps = true; - - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core poetry-dynamic-versioning ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ anyconfig appdirs colorama + dynaconf environs + gitpython jinja2 jsonschema nested-lookup pathspec python-json-logger ruamel-yaml + structlog ]; - # Module has no tests - doCheck = false; + pythonRelaxDeps = true; - pythonImportsCheck = [ - "ansibledoctor" - ]; + doCheck = true; + + pythonImportsCheck = [ "ansibledoctor" ]; + + # ansible.errors.AnsibleError: Unable to create local directories(/private/var/empty/.ansible/tmp) + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; meta = { description = "Annotation based documentation for your Ansible roles";