diff options
| -rw-r--r-- | nixos/modules/services/matrix/dendrite.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/dendrite/default.nix | 13 |
2 files changed, 15 insertions, 9 deletions
diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index a8006547fc6b4..244c15fbf7a96 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -159,6 +159,15 @@ in ''; }; }; + options.relay_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:relayapi.db"; + description = lib.mdDoc '' + Database for the Relay Server. + ''; + }; + }; options.media_api = { database = { connection_string = lib.mkOption { @@ -294,7 +303,7 @@ in -o /run/dendrite/dendrite.yaml '']; ExecStart = lib.strings.concatStringsSep " " ([ - "${pkgs.dendrite}/bin/dendrite-monolith-server" + "${pkgs.dendrite}/bin/dendrite" "--config /run/dendrite/dendrite.yaml" ] ++ lib.optionals (cfg.httpPort != null) [ "--http-bind-address :${builtins.toString cfg.httpPort}" diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 1bc4bcbbf4556..67b91bbe5cd6c 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,22 +3,20 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-+REY5an0gTbADEozCI6bkUWbW9VWTtWZ4xXj9qcIkwc="; + hash = "sha256-syOLrw4ig8rmFDkxJ9KSAuzUVO8UokekV17mT1bJNNM="; }; - vendorHash = "sha256-/O7zzXYM03K+MresuXIHtgMuD9yS2+NIaLEnm/WRYeA="; + vendorHash = "sha256-nvGhKCUiyHSD0VpE4OtT9YQSHxv0d7iwOChCJl2D3zk="; subPackages = [ - # The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith - "cmd/dendrite-monolith-server" - # The server as a polylith: https://matrix-org.github.io/dendrite/installation/install/polylith - "cmd/dendrite-polylith-multi" + # The server + "cmd/dendrite" # admin tools "cmd/create-account" "cmd/generate-config" @@ -31,7 +29,6 @@ buildGoModule rec { ## tech demos # "cmd/dendrite-demo-pinecone" # "cmd/dendrite-demo-yggdrasil" - # "cmd/dendritejs-pinecone" ]; nativeCheckInputs = [ |