Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88b859926a07
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1351dde073a5
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 14, 2019

  1. matrix-synapse: 1.3.1 -> 1.4.0 

    Bumps `matrix-synapse` to version 1.4.0[1]. With this version the
following changes in the matrix-synapse module were needed:

* Removed `trusted_third_party_id_servers`: option is marked as deprecated
  and ignored by matrix-synapse[2].
* Added `account_threepid_delegates` options as replacement for 3rdparty
  server features[3].
* Added `redaction_retention_period` option to configure how long
  redacted options should be kept in the database.
* Added `ma27` as maintainer for `matrix-synapse`.

Co-Authored-By: Notkea <pacien@users.noreply.github.com>
Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>

[1] https://matrix.org/blog/2019/10/03/synapse-1-4-0-released
[2] matrix-org/synapse#5875
[3] matrix-org/synapse#5876

(cherry picked from commit 3724223)
    @Vskilet @Ma27
    Vskilet authored and Ma27 committed Oct 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    saschagrunert Sascha Grunert
    GPG key ID: 8CE029DD1A866E52
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1351dde View commit details
Showing with 35 additions and 11 deletions.
  1. +32 −8 nixos/modules/services/misc/matrix-synapse.nix
  2. +3 −3 pkgs/servers/matrix-synapse/default.nix
40 changes: 32 additions & 8 deletions nixos/modules/services/misc/matrix-synapse.nix
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,11 @@ turn_user_lifetime: "${cfg.turn_user_lifetime}"
user_creation_max_duration: ${cfg.user_creation_max_duration}
bcrypt_rounds: ${cfg.bcrypt_rounds}
allow_guest_access: ${boolToString cfg.allow_guest_access}
trusted_third_party_id_servers: ${builtins.toJSON cfg.trusted_third_party_id_servers}
account_threepid_delegates:
${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}"
@@ -102,6 +106,7 @@ perspectives:
'') cfg.servers)}
}
}
redaction_retention_period: ${toString cfg.redaction_retention_period}
app_service_config_files: ${builtins.toJSON cfg.app_service_config_files}
${cfg.extraConfig}
@@ -552,14 +557,18 @@ in {
accessible to anonymous users.
'';
};
trusted_third_party_id_servers = mkOption {
type = types.listOf types.str;
default = [
"matrix.org"
"vector.im"
];
account_threepid_delegates.email = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
The list of identity servers trusted to verify third party identifiers by this server.
Delegate email sending to https://example.org
'';
};
account_threepid_delegates.msisdn = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Delegate SMS sending to this local process (https://localhost:8090)
'';
};
room_invite_state_types = mkOption {
@@ -600,6 +609,13 @@ in {
A list of application service config file to use
'';
};
redaction_retention_period = mkOption {
type = types.int;
default = 7;
description = ''
How long to keep redacted events in unredacted form in the database.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -699,4 +715,12 @@ in {
};
};
};

imports = [
(mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] ''
The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0
as the behavior is now obsolete.
'')
];

}
6 changes: 3 additions & 3 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.3.1";
version = "1.4.0";

src = fetchPypi {
inherit pname version;
sha256 = "1nz9bhy5hraa1h7100vr0innz8npnpha6xr9j2ln7h3cgwv73739";
sha256 = "1y8yhzsf2lk2d7v4l61rpy4918c0qz276j79q88l9yazb6gw5pkk";
};

patches = [
@@ -83,6 +83,6 @@ in buildPythonApplication rec {
homepage = https://matrix.org;
description = "Matrix reference homeserver";
license = licenses.asl20;
maintainers = with maintainers; [ ralith roblabla ekleog pacien ];
maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ];
};
}