From 975ae5ec7eb56363e35a60b7185053c9534b20b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Nov 2024 13:04:57 +0100 Subject: [PATCH 1/6] python312Packages.tldextract: 5.1.2 -> 5.1.3 Diff: https://github.com/john-kurkowski/tldextract/compare/refs/tags/5.1.2...5.1.3 Changelog: https://github.com/john-kurkowski/tldextract/blob/5.1.3/CHANGELOG.md --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index a4044fc8a0ce..8859822716dd 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "tldextract"; - version = "5.1.2"; + version = "5.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "john-kurkowski"; repo = "tldextract"; rev = "refs/tags/${version}"; - hash = "sha256-rieDDSCit9UcMpCMs2X3+cCS41Wbrp4WWVMzKj/jwEM="; + hash = "sha256-gcgQGZS/dsTTC4Szpjreb2fAsVZxxOCE1erVvU1q4xM="; }; nativeBuildInputs = [ From eca7e4cc74c0021aa91f11a719391011145f158d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:39:54 +0100 Subject: [PATCH 2/6] python312Packages.certbot-dns-ovh: ignore DeprecationWarning --- .../python-modules/certbot-dns-ovh/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/pkgs/development/python-modules/certbot-dns-ovh/default.nix index 4858b5827969..6e976eccb8ce 100644 --- a/pkgs/development/python-modules/certbot-dns-ovh/default.nix +++ b/pkgs/development/python-modules/certbot-dns-ovh/default.nix @@ -1,22 +1,25 @@ { - buildPythonPackage, acme, + buildPythonPackage, certbot, dns-lexicon, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "certbot-dns-ovh"; - format = "setuptools"; + pyproject = true; inherit (certbot) src version; disabled = pythonOlder "3.6"; sourceRoot = "${src.name}/certbot-dns-ovh"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ acme certbot dns-lexicon @@ -28,9 +31,8 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" - "-W 'ignore:Package lexicon.providers is deprecated and will be removed in Lexicon 4>=.:DeprecationWarning'" - "-W 'ignore:Legacy configuration object has been used to load the ConfigResolver.:DeprecationWarning'" + "-W" + "ignore::DeprecationWarning" ]; meta = certbot.meta // { From 487e53512283f9ccd20fe0e9888c32adff7e1442 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:49:47 +0100 Subject: [PATCH 3/6] python312Packages.certbot-dns-cloudflare: ignore DeprecationWarning --- .../python-modules/certbot-dns-cloudflare/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 1d0a48549c16..9833bed552d4 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" + "-W" + "ignore::DeprecationWarning" ]; meta = certbot.meta // { From 3dcad335b14fee939b4c2ae5c51f47b91a78072a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:50:20 +0100 Subject: [PATCH 4/6] python312Packages.certbot-dns-rfc2136: ignore DeprecationWarning --- .../development/python-modules/certbot-dns-rfc2136/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index d4883bd2ad02..c0910bdf40f8 100644 --- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" + "-W" + "ignore::DeprecationWarning" ]; meta = certbot.meta // { From 4992f62249954cb5e70666251b75f77645c94882 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:56:13 +0100 Subject: [PATCH 5/6] python312Packages.certbot-dns-route53: ignore DeprecationWarning --- .../python-modules/certbot-dns-route53/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index 798631b0c79e..3d6a28bed781 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { inherit (certbot) src version; disabled = pythonOlder "3.6"; + sourceRoot = "${src.name}/certbot-dns-route53"; + propagatedBuildInputs = [ acme boto3 @@ -26,11 +28,10 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" + "-W" + "ignore::DeprecationWarning" ]; - sourceRoot = "${src.name}/certbot-dns-route53"; - meta = certbot.meta // { description = "Route53 DNS Authenticator plugin for Certbot"; }; From 14a02190a3a6bf51016f928adc9ec6d98ab56c53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:57:15 +0100 Subject: [PATCH 6/6] python312Packages.certbot-dns-route53: refactor --- .../python-modules/certbot-dns-route53/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index 3d6a28bed781..01156dd0b799 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -5,18 +5,21 @@ certbot, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "certbot-dns-route53"; - format = "setuptools"; + pyproject = true; inherit (certbot) src version; disabled = pythonOlder "3.6"; sourceRoot = "${src.name}/certbot-dns-route53"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ acme boto3 certbot