From 35e471ad45b7fdf1c1f5a7e624a15671994888ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 20 Jun 2025 14:55:12 +0200 Subject: [PATCH] tlsrpt-reporter: apply patch for fetcher issue when no db exists The fetcher would then error out and not return the proper protocol version to the reportd instance, causing an error message. This is annoying, because I want to match success in the test. --- nixos/tests/tlsrpt.nix | 1 + pkgs/by-name/tl/tlsrpt-reporter/package.nix | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/nixos/tests/tlsrpt.nix b/nixos/tests/tlsrpt.nix index ccbb5c25e0fc..d93ac78b5240 100644 --- a/nixos/tests/tlsrpt.nix +++ b/nixos/tests/tlsrpt.nix @@ -31,6 +31,7 @@ machine.wait_for_file("/run/tlsrpt/collectd.sock") machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-collectd | grep -Pq 'Database .* setup finished'") machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Database .* setup finished'") + machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Fetcher .* finished'") # Enabling postfix should put sendmail as the sendmail setting machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg") diff --git a/pkgs/by-name/tl/tlsrpt-reporter/package.nix b/pkgs/by-name/tl/tlsrpt-reporter/package.nix index 713870ae063e..bbd2a6e94c4a 100644 --- a/pkgs/by-name/tl/tlsrpt-reporter/package.nix +++ b/pkgs/by-name/tl/tlsrpt-reporter/package.nix @@ -5,6 +5,7 @@ installShellFiles, python3, fetchFromGitHub, + fetchpatch, nixosTests, }: @@ -25,6 +26,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-IH8hJX9l+YonqOuszcMome4mjdIaedgGNIptxTyH1ng="; }; + patches = [ + (fetchpatch { + # https://github.com/sys4/tlsrpt-reporter/issues/43 + url = "https://github.com/sys4/tlsrpt-reporter/commit/32d00c13508dd7f9695b77e253e88c88dc838fbd.patch"; + hash = "sha256-RUNF86RkTu6DLv6/7eaY//fFB8kGzmZxQ70kdNpLxj8="; + }) + ]; + nativeBuildInputs = [ asciidoctor automake