From 22b74b95bcaf58836957f2ecb8bd9baafacc7da1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 18 Jun 2025 19:12:24 -0400 Subject: [PATCH 1/3] matrix-synapse: apply patch fixing build with libxml >= 2.14 --- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 69acde9bad8c..60c8bd9400ab 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, python3, openssl, libiconv, @@ -27,6 +28,15 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo="; }; + patches = [ + # Skip broken HTML preview test case with libxml >= 2.14 + # https://github.com/element-hq/synapse/pull/18413 + (fetchpatch { + url = "https://github.com/element-hq/synapse/commit/8aad32965888476b4660bf8228d2d2aa9ccc848b.patch"; + hash = "sha256-EUEbF442nOAybMI8EL6Ee0ib3JqSlQQ04f5Az3quKko="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E="; From 83ef4fc3871086eb93bebd10adcf2a7cdd3c3f97 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 18 Jun 2025 19:13:39 -0400 Subject: [PATCH 2/3] matrix-synapse: 1.131.0 -> 1.132.0 Diff: https://github.com/element-hq/synapse/compare/v1.131.0...v1.132.0 Changelog: https://github.com/element-hq/synapse/releases/tag/v1.132.0 --- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 60c8bd9400ab..2b0914ba526f 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -18,14 +18,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.131.0"; + version = "1.132.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo="; + hash = "sha256-yKoBYwd2djHAawBJRcbdrJH16+MHpYQnU7h39SvWqYE="; }; patches = [ From 939b7583daf4a62838fc089e6b5a1db196360c81 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 20 Jun 2025 13:01:34 +0200 Subject: [PATCH 3/3] nixos/matrix-synapse: fix test eval --- nixos/tests/matrix/synapse.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix index 323fa25ccb6c..4b9ade875a78 100644 --- a/nixos/tests/matrix/synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -187,8 +187,6 @@ in networksStyle = "subnet"; enableSubmission = true; tlsTrustedAuthorities = "${mailerCerts.ca.cert}"; - sslCert = "${mailerCerts.${mailerDomain}.cert}"; - sslKey = "${mailerCerts.${mailerDomain}.key}"; # blackhole transport transport = "example.com discard:silently"; @@ -205,6 +203,14 @@ in smtp_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; smtp_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; + smtp_tls_chain_files = [ + "${mailerCerts.${mailerDomain}.key}" + "${mailerCerts.${mailerDomain}.cert}" + ]; + smtpd_tls_chain_files = [ + "${mailerCerts.${mailerDomain}.key}" + "${mailerCerts.${mailerDomain}.cert}" + ]; }; }; };