JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matrix-dendrite: rename to dendrite

Browse Source 
No other distro calls it matrix-dendrite:
https://repology.org/project/matrix-dendrite
This commit is contained in:
Robert Schütz 2021-05-05 12:30:39 +02:00
parent ce93c98ce2
commit 007cab9644
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/misc/matrix-dendrite.nix
View File

@ -30,7 +30,7 @@ in
The path to the TLS certificate.
<programlisting>
nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
</programlisting>
'';
};
@ -42,7 +42,7 @@ in
The path to the TLS key.
<programlisting>
nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
</programlisting>
'';
};
@ -95,7 +95,7 @@ in
requests and events.
<programlisting>
nix-shell -p matrix-dendrite --command "generate-keys --private-key matrix_key.pem"
nix-shell -p dendrite --command "generate-keys --private-key matrix_key.pem"
</programlisting>
'';
};
@ -136,7 +136,7 @@ in
message = ''
If Dendrite is configured to use https, tlsCert and tlsKey must be provided.
nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
'';
}];
@ -163,7 +163,7 @@ in
${pkgs.coreutils}/bin/cp ${configurationYaml} /run/matrix-dendrite/dendrite.yaml
'';
ExecStart = lib.strings.concatStringsSep " " ([
"${pkgs.matrix-dendrite}/bin/dendrite-monolith-server"
"${pkgs.dendrite}/bin/dendrite-monolith-server"
"--config /run/matrix-dendrite/dendrite.yaml"
] ++ lib.optionals (cfg.httpPort != null) [
"--http-bind-address :${builtins.toString cfg.httpPort}"

0
pkgs/servers/matrix-dendrite/default.nix → pkgs/servers/dendrite/default.nix
View File

4
pkgs/top-level/all-packages.nix
View File

@ -6113,8 +6113,6 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
matrix-dendrite = callPackage ../servers/matrix-dendrite { };
/* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails
(https://github.com/NixOS/nixpkgs/issues/76093) */
matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ };
@ -18582,6 +18580,8 @@ in
couchpotato = callPackage ../servers/couchpotato {};
dendrite = callPackage ../servers/dendrite { };
dex-oidc = callPackage ../servers/dex { };
dex2jar = callPackage ../development/tools/java/dex2jar { };