From c6f109bb59c88483f77be5074e388d357d34c067 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 15:10:45 +0100 Subject: [PATCH 1/2] lexicon: add changelog to meta --- pkgs/tools/admin/lexicon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4faebec28061..c5308c9de717 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -58,6 +58,7 @@ buildPythonApplication rec { meta = with lib; { description = "Manipulate DNS records of various DNS providers in a standardized way"; homepage = "https://github.com/AnalogJ/lexicon"; + changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; From a2a496663876e4660cd20d6862fc75a7848d2aeb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 15:29:39 +0100 Subject: [PATCH 2/2] lexicon: 3.9.4 -> 3.11.7 Diff: AnalogJ/lexicon@refs/tags/v3.9.4...v3.11.7 Changelog: https://github.com/AnalogJ/lexicon/blob/v3.11.7/CHANGELOG.md --- pkgs/tools/admin/lexicon/default.nix | 48 ++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index c5308c9de717..c17f75127416 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -7,13 +7,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "lexicon"; - version = "3.9.4"; + version = "3.11.7"; format = "pyproject"; src = fetchFromGitHub { owner = "AnalogJ"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-TySgIxBEl2RolndAkEN4vCIDKaI48vrh2ocd+CTn7Ow="; }; @@ -23,32 +23,54 @@ buildPythonApplication rec { propagatedBuildInputs = [ beautifulsoup4 - boto3 cryptography - dnspython - future - localzone - oci - pynamecheap + importlib-metadata pyyaml requests - softlayer tldextract - transip - xmltodict - zeep ]; + passthru.optional-dependencies = { + route53 = [ + boto3 + ]; + localzone = [ + localzone + ]; + softlayer = [ + softlayer + ]; + gransy = [ + zeep + ]; + ddns = [ + dnspython + ]; + oci = [ + oci + ]; + full = [ + boto3 + dnspython + localzone + oci + softlayer + zeep + ]; + }; + nativeCheckInputs = [ mock pytestCheckHook pytest-xdist vcrpy - ]; + ] ++ passthru.optional-dependencies.full; disabledTestPaths = [ # Tests require network access "lexicon/tests/providers/test_auto.py" + # Tests require an additional setup + "lexicon/tests/providers/test_localzone.py" ]; pythonImportsCheck = [