Merge pull request #123355 from Ma27/bump-matrix-synapse

Changed files
+31 -6
nixos
modules
services
pkgs
servers
matrix-synapse
+29 -4
nixos/modules/services/misc/matrix-synapse.nix
···
${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"}
${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"}
-
room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types}
${optionalString (cfg.macaroon_secret_key != null) ''
macaroon_secret_key: "${cfg.macaroon_secret_key}"
''}
···
Delegate SMS sending to this local process (https://localhost:8090)
'';
};
-
room_invite_state_types = mkOption {
type = types.listOf types.str;
-
default = ["m.room.join_rules" "m.room.canonical_alias" "m.room.avatar" "m.room.name"];
description = ''
-
A list of event types that will be included in the room_invite_state
'';
};
macaroon_secret_key = mkOption {
···
<nixpkgs/nixos/tests/matrix-synapse.nix>
'')
(mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
];
meta.doc = ./matrix-synapse.xml;
···
${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"}
${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"}
+
room_prejoin_state:
+
disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types}
+
additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types}
${optionalString (cfg.macaroon_secret_key != null) ''
macaroon_secret_key: "${cfg.macaroon_secret_key}"
''}
···
Delegate SMS sending to this local process (https://localhost:8090)
'';
};
+
room_prejoin_state.additional_event_types = mkOption {
+
default = [];
type = types.listOf types.str;
description = ''
+
Additional events to share with users who received an invite.
+
'';
+
};
+
room_prejoin_state.disable_default_event_types = mkOption {
+
default = false;
+
type = types.bool;
+
description = ''
+
Whether to disable the default state-event types for users invited to a room.
+
These are:
+
+
<itemizedlist>
+
<listitem><para>m.room.join_rules</para></listitem>
+
<listitem><para>m.room.canonical_alias</para></listitem>
+
<listitem><para>m.room.avatar</para></listitem>
+
<listitem><para>m.room.encryption</para></listitem>
+
<listitem><para>m.room.name</para></listitem>
+
<listitem><para>m.room.create</para></listitem>
+
</itemizedlist>
'';
};
macaroon_secret_key = mkOption {
···
<nixpkgs/nixos/tests/matrix-synapse.nix>
'')
(mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
+
(mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] ''
+
You may add additional event types via
+
`services.matrix-synapse.room_prejoin_state.additional_event_types` and
+
disable the default events via
+
`services.matrix-synapse.room_prejoin_state.disable_default_event_types`.
+
'')
];
meta.doc = ./matrix-synapse.xml;
+2 -2
pkgs/servers/matrix-synapse/default.nix
···
in
buildPythonApplication rec {
pname = "matrix-synapse";
-
version = "1.33.2";
src = fetchPypi {
inherit pname version;
-
sha256 = "sha256-9WZjuVvWpzCR1MjeMXfja/YV2YFHdo7QbjgUWDymCpM=";
};
patches = [
···
in
buildPythonApplication rec {
pname = "matrix-synapse";
+
version = "1.34.0";
src = fetchPypi {
inherit pname version;
+
sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw=";
};
patches = [