commit 446c97f96f956131036aa98b8ecf275c0d78ac2b · pyrox.dev/nixpkgs

+29 -4

nixos/modules/services/misc/matrix-synapse.nix

···

       86
       86
        
         ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"}

     

       87
       87
        
         ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"}

     

       88
       88
        
       

     

       89
       89
       -
       room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types}

     

       89
       89
       +
       room_prejoin_state:

     

       90
       90
       +
         disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types}

     

       91
       91
       +
         additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types}

     

       90
       92
        
       ${optionalString (cfg.macaroon_secret_key != null) ''

     

       91
       93
        
         macaroon_secret_key: "${cfg.macaroon_secret_key}"

     

       92
       94
        
       ''}

     
···

       577
       579
        
                 Delegate SMS sending to this local process (https://localhost:8090)

     

       578
       580
        
               '';

     

       579
       581
        
             };

     

       580
       580
       -
             room_invite_state_types = mkOption {

     

       582
       582
       +
             room_prejoin_state.additional_event_types = mkOption {

     

       583
       583
       +
               default = [];

     

       581
       584
        
               type = types.listOf types.str;

     

       582
       582
       -
               default = ["m.room.join_rules" "m.room.canonical_alias" "m.room.avatar" "m.room.name"];

     

       583
       585
        
               description = ''

     

       584
       584
       -
                 A list of event types that will be included in the room_invite_state

     

       586
       586
       +
                 Additional events to share with users who received an invite.

     

       587
       587
       +
               '';

     

       588
       588
       +
             };

     

       589
       589
       +
             room_prejoin_state.disable_default_event_types = mkOption {

     

       590
       590
       +
               default = false;

     

       591
       591
       +
               type = types.bool;

     

       592
       592
       +
               description = ''

     

       593
       593
       +
                 Whether to disable the default state-event types for users invited to a room.

     

       594
       594
       +
                 These are:

     

       595
       595
       +
       

     

       596
       596
       +
                 <itemizedlist>

     

       597
       597
       +
                 <listitem><para>m.room.join_rules</para></listitem>

     

       598
       598
       +
                 <listitem><para>m.room.canonical_alias</para></listitem>

     

       599
       599
       +
                 <listitem><para>m.room.avatar</para></listitem>

     

       600
       600
       +
                 <listitem><para>m.room.encryption</para></listitem>

     

       601
       601
       +
                 <listitem><para>m.room.name</para></listitem>

     

       602
       602
       +
                 <listitem><para>m.room.create</para></listitem>

     

       603
       603
       +
                 </itemizedlist>

     

       585
       604
        
               '';

     

       586
       605
        
             };

     

       587
       606
        
             macaroon_secret_key = mkOption {

     
···

       728
       747
        
             <nixpkgs/nixos/tests/matrix-synapse.nix>

     

       729
       748
        
           '')

     

       730
       749
        
           (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")

     

       750
       750
       +
           (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] ''

     

       751
       751
       +
             You may add additional event types via

     

       752
       752
       +
             `services.matrix-synapse.room_prejoin_state.additional_event_types` and

     

       753
       753
       +
             disable the default events via

     

       754
       754
       +
             `services.matrix-synapse.room_prejoin_state.disable_default_event_types`.

     

       755
       755
       +
           '')

     

       731
       756
        
         ];

     

       732
       757
        
       

     

       733
       758
        
         meta.doc = ./matrix-synapse.xml;

+2 -2

pkgs/servers/matrix-synapse/default.nix

···

       12
       12
        
       in

     

       13
       13
        
       buildPythonApplication rec {

     

       14
       14
        
         pname = "matrix-synapse";

     

       15
       15
       -
         version = "1.33.2";

     

       15
       15
       +
         version = "1.34.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "sha256-9WZjuVvWpzCR1MjeMXfja/YV2YFHdo7QbjgUWDymCpM=";

     

       19
       19
       +
           sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         patches = [