From e7334b57c24a4e3f46e9f0cd2947269f935a44bd Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 17 Apr 2026 23:43:35 +0200 Subject: [PATCH 1/2] python314Packages.cert-chain-resolver: fix build --- .../python-modules/cert-chain-resolver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix index 91da4c22f15d..515829df2d92 100644 --- a/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + cacert, cryptography, fetchFromGitHub, pytestCheckHook, @@ -28,10 +29,13 @@ buildPythonPackage rec { six ]; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + disabledTests = [ # Tests require network access "test_cert_returns_completed_chain" "test_display_flag_is_properly_formatted" + "test_display_flag_includes_warning_when_root_was_requested_but_not_found" ]; pythonImportsCheck = [ "cert_chain_resolver" ]; From 15671b3f26e7d34715f019b26ca6c67974fbf842 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 17 Apr 2026 23:44:45 +0200 Subject: [PATCH 2/2] python314Packages.cert-chain-resolver: modernize --- .../cert-chain-resolver/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix index 515829df2d92..a5aa6edc6f0e 100644 --- a/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -4,24 +4,27 @@ cacert, cryptography, fetchFromGitHub, + setuptools, pytestCheckHook, pytest-mock, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cert-chain-resolver"; version = "1.4.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rkoopmans"; repo = "python-certificate-chain-resolver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DWE+mR7EO5ohuRAR0WC40GBY7HpwXIpU0hhVUnWNRno="; }; - propagatedBuildInputs = [ cryptography ]; + build-system = [ setuptools ]; + + dependencies = [ cryptography ]; nativeCheckInputs = [ pytestCheckHook @@ -44,8 +47,8 @@ buildPythonPackage rec { description = "Resolve / obtain the certificate intermediates of a x509 certificate"; mainProgram = "cert-chain-resolver"; homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; - changelog = "https://github.com/rkoopmans/python-certificate-chain-resolver/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/rkoopmans/python-certificate-chain-resolver/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veehaitch ]; }; -} +})