ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

dendrite: 0.11.0 -> 0.12.0

Browse Source 
Diff: https://github.com/matrix-org/dendrite/compare/v0.12.0...v0.12.0

Changelog: https://github.com/matrix-org/dendrite/releases/tag/v0.12.0
This commit is contained in:
Jörg Thalheim 2023-03-18 15:12:39 +01:00
parent b9c548a4c7
commit 2c19718bee
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/matrix/dendrite.nix
View File

@ -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}"

13
pkgs/servers/dendrite/default.nix
View File

@ -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 = [