Update dependencies
All checks were successful
Cachix / build (kholinar) (push) Successful in 10m9s
Cachix / build (elendel) (push) Successful in 3m57s
Cachix / build (marabethia) (push) Successful in 4m58s

This commit is contained in:
Charlotte Van Petegem 2025-06-23 09:30:54 +02:00
parent 861079a595
commit 43fe3e5087
Signed by: chvp
SSH key fingerprint: SHA256:+xxExaZKfphaPBA/f79I53pATM1GM3mRUFmOl/ChUbM
3 changed files with 25 additions and 120 deletions

View file

@ -1,27 +0,0 @@
diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
index b38f13c39c4e5b..ccf7bf9138d9ff 100644
--- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix
+++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
@@ -14,19 +14,19 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
- version = "0.12.1";
+ version = "0.12.2";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
- hash = "sha256-WZPmSIkRSCrI1krIWJ2abVw1t81vjcqewTdx0W2aD+Q=";
+ hash = "sha256-Es6RWUo/e25wYGIz6feVNXIQbMCDPl1iZoKT3x8vHtA=";
};
buildInputs = lib.optional (!withGoolm) olm;
tags = lib.optional withGoolm "goolm";
- vendorHash = "sha256-jgwi0ENJ064gWJWyvlSlaEicC+NAtn0Tdbnu6mzmLoE=";
+ vendorHash = "sha256-/R6MI6egGV1E1YzKcxBSOb2z97kA1HCK5GdMgfR1vSM=";
doCheck = false;

View file

@ -1,68 +0,0 @@
diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix
index 323fa25ccb6c9d..4b9ade875a7832 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}"
+ ];
};
};
};
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 69acde9bad8c12..2b0914ba526f85 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,
@@ -17,16 +18,25 @@ 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 = [
+ # 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=";