mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Merge pull request #157923 from tim-tx/update/dendrite-0.6.0
This commit is contained in:
commit
e9183df241
|
@ -766,6 +766,18 @@
|
||||||
directly.
|
directly.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>dendrite</literal> package has been upgraded from
|
||||||
|
0.5.1 to
|
||||||
|
<link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.5">0.6.5</link>.
|
||||||
|
Instances configured with split sqlite databases, which has
|
||||||
|
been the default in NixOS, require merging of the federation
|
||||||
|
sender and signing key databases. See upstream
|
||||||
|
<link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.0">release
|
||||||
|
notes</link> on version 0.6.0 for details on database changes.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The existing <literal>pkgs.opentelemetry-collector</literal>
|
The existing <literal>pkgs.opentelemetry-collector</literal>
|
||||||
|
|
|
@ -293,6 +293,14 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
|
This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
|
||||||
|
|
||||||
|
- The `dendrite` package has been upgraded from 0.5.1 to
|
||||||
|
[0.6.5](https://github.com/matrix-org/dendrite/releases/tag/v0.6.5). Instances
|
||||||
|
configured with split sqlite databases, which has been the default
|
||||||
|
in NixOS, require merging of the federation sender and signing key
|
||||||
|
databases. See upstream [release
|
||||||
|
notes](https://github.com/matrix-org/dendrite/releases/tag/v0.6.0)
|
||||||
|
on version 0.6.0 for details on database changes.
|
||||||
|
|
||||||
- The existing `pkgs.opentelemetry-collector` has been moved to
|
- The existing `pkgs.opentelemetry-collector` has been moved to
|
||||||
`pkgs.opentelemetry-collector-contrib` to match the actual source being the
|
`pkgs.opentelemetry-collector-contrib` to match the actual source being the
|
||||||
"contrib" edition. `pkgs.opentelemetry-collector` is now the actual core
|
"contrib" edition. `pkgs.opentelemetry-collector` is now the actual core
|
||||||
|
|
|
@ -110,6 +110,15 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
options.app_service_api.database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:federationapi.db";
|
||||||
|
description = ''
|
||||||
|
Database for the Appservice API.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
options.client_api = {
|
options.client_api = {
|
||||||
registration_disabled = lib.mkOption {
|
registration_disabled = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
|
@ -120,6 +129,91 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
options.federation_api.database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:federationapi.db";
|
||||||
|
description = ''
|
||||||
|
Database for the Federation API.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
options.key_server.database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:keyserver.db";
|
||||||
|
description = ''
|
||||||
|
Database for the Key Server (for end-to-end encryption).
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
options.media_api = {
|
||||||
|
database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:mediaapi.db";
|
||||||
|
description = ''
|
||||||
|
Database for the Media API.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
base_path = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "${workingDir}/media_store";
|
||||||
|
description = ''
|
||||||
|
Storage path for uploaded media.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
options.room_server.database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:roomserver.db";
|
||||||
|
description = ''
|
||||||
|
Database for the Room Server.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
options.sync_api.database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:syncserver.db";
|
||||||
|
description = ''
|
||||||
|
Database for the Sync API.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
options.user_api = {
|
||||||
|
account_database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:userapi_accounts.db";
|
||||||
|
description = ''
|
||||||
|
Database for the User API, accounts.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
device_database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:userapi_devices.db";
|
||||||
|
description = ''
|
||||||
|
Database for the User API, devices.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
options.mscs = {
|
||||||
|
database = {
|
||||||
|
connection_string = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "file:mscs.db";
|
||||||
|
description = ''
|
||||||
|
Database for exerimental MSC's.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
default = { };
|
default = { };
|
||||||
description = ''
|
description = ''
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "matrix-dendrite";
|
pname = "matrix-dendrite";
|
||||||
version = "0.5.1";
|
version = "0.6.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "matrix-org";
|
owner = "matrix-org";
|
||||||
repo = "dendrite";
|
repo = "dendrite";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k=";
|
sha256 = "jSn2awZsfsniSOTNkaEdQw/sZm7nUfiMntsxigy/51Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I=";
|
vendorSha256 = "sha256-B4d3FGXy8TrED3oikTjETQso/AtEfIWWcdY6FykD/8A=";
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
inherit (nixosTests) dendrite;
|
inherit (nixosTests) dendrite;
|
||||||
|
|
Loading…
Reference in a new issue