Merge pull request #123355 from Ma27/bump-matrix-synapse
This commit is contained in:
commit
446c97f96f
|
@ -86,7 +86,9 @@ account_threepid_delegates:
|
||||||
${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"}
|
${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}"}
|
${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"}
|
||||||
|
|
||||||
room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types}
|
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) ''
|
${optionalString (cfg.macaroon_secret_key != null) ''
|
||||||
macaroon_secret_key: "${cfg.macaroon_secret_key}"
|
macaroon_secret_key: "${cfg.macaroon_secret_key}"
|
||||||
''}
|
''}
|
||||||
|
@ -577,11 +579,28 @@ in {
|
||||||
Delegate SMS sending to this local process (https://localhost:8090)
|
Delegate SMS sending to this local process (https://localhost:8090)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
room_invite_state_types = mkOption {
|
room_prejoin_state.additional_event_types = mkOption {
|
||||||
|
default = [];
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = ["m.room.join_rules" "m.room.canonical_alias" "m.room.avatar" "m.room.name"];
|
|
||||||
description = ''
|
description = ''
|
||||||
A list of event types that will be included in the room_invite_state
|
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 {
|
macaroon_secret_key = mkOption {
|
||||||
|
@ -728,6 +747,12 @@ in {
|
||||||
<nixpkgs/nixos/tests/matrix-synapse.nix>
|
<nixpkgs/nixos/tests/matrix-synapse.nix>
|
||||||
'')
|
'')
|
||||||
(mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
|
(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;
|
meta.doc = ./matrix-synapse.xml;
|
||||||
|
|
|
@ -12,11 +12,11 @@ let
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "matrix-synapse";
|
pname = "matrix-synapse";
|
||||||
version = "1.33.2";
|
version = "1.34.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-9WZjuVvWpzCR1MjeMXfja/YV2YFHdo7QbjgUWDymCpM=";
|
sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
Loading…
Reference in a new issue