git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123355 from Ma27/bump-matrix-synapse
commit446c97f96f956131036aa98b8ecf275c0d78ac2b authorMartin Weinelt <mweinelt@users.noreply.github.com> dateWed 19 May 2021, 18:12 (5 years ago) parentbbc6b502addab5
2 files changed+31−6
nixos/modules/services/misc/matrix-synapse.nix+29−4 pkgs/servers/matrix-synapse/default.nix+2−2
nixos/modules/services/misc/matrix-synapse.nix+29−4
@@ -86,7 +86,9 @@ account_threepid_delegates:
8686 ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"}
8787 ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"}
8888
89−room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types}
89+room_prejoin_state:
90+ disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types}
91+ additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types}
9092${optionalString (cfg.macaroon_secret_key != null) ''
9193 macaroon_secret_key: "${cfg.macaroon_secret_key}"
9294''}
@@ -577,11 +579,28 @@ in {
577579 Delegate SMS sending to this local process (https://localhost:8090)
578580 '';
579581 };
580− room_invite_state_types = mkOption {
582+ room_prejoin_state.additional_event_types = mkOption {
583+ default = [];
581584 type = types.listOf types.str;
582− default = ["m.room.join_rules" "m.room.canonical_alias" "m.room.avatar" "m.room.name"];
583585 description = ''
584− A list of event types that will be included in the room_invite_state
586+ Additional events to share with users who received an invite.
587+ '';
588+ };
589+ room_prejoin_state.disable_default_event_types = mkOption {
590+ default = false;
591+ type = types.bool;
592+ description = ''
593+ Whether to disable the default state-event types for users invited to a room.
594+ These are:
595+
596+ <itemizedlist>
597+ <listitem><para>m.room.join_rules</para></listitem>
598+ <listitem><para>m.room.canonical_alias</para></listitem>
599+ <listitem><para>m.room.avatar</para></listitem>
600+ <listitem><para>m.room.encryption</para></listitem>
601+ <listitem><para>m.room.name</para></listitem>
602+ <listitem><para>m.room.create</para></listitem>
603+ </itemizedlist>
585604 '';
586605 };
587606 macaroon_secret_key = mkOption {
@@ -728,6 +747,12 @@ in {
728747 <nixpkgs/nixos/tests/matrix-synapse.nix>
729748 '')
730749 (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
750+ (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] ''
751+ You may add additional event types via
752+ `services.matrix-synapse.room_prejoin_state.additional_event_types` and
753+ disable the default events via
754+ `services.matrix-synapse.room_prejoin_state.disable_default_event_types`.
755+ '')
731756 ];
732757
733758 meta.doc = ./matrix-synapse.xml;
pkgs/servers/matrix-synapse/default.nix+2−2
@@ -12,11 +12,11 @@ let
1212in
1313buildPythonApplication rec {
1414 pname = "matrix-synapse";
15− version = "1.33.2";
15+ version = "1.34.0";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "sha256-9WZjuVvWpzCR1MjeMXfja/YV2YFHdo7QbjgUWDymCpM=";
19+ sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw=";
2020 };
2121
2222 patches = [