From 007cab96448921b45547a6bc85117052cbc2429a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 5 May 2021 12:30:39 +0200
Subject: [PATCH] matrix-dendrite: rename to dendrite

No other distro calls it matrix-dendrite:
https://repology.org/project/matrix-dendrite
---
 nixos/modules/services/misc/matrix-dendrite.nix        | 10 +++++-----
 pkgs/servers/{matrix-dendrite => dendrite}/default.nix |  0
 pkgs/top-level/all-packages.nix                        |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/servers/{matrix-dendrite => dendrite}/default.nix (100%)

diff --git a/nixos/modules/services/misc/matrix-dendrite.nix b/nixos/modules/services/misc/matrix-dendrite.nix
index b719df29c5ab..24051e0b3b47 100644
--- a/nixos/modules/services/misc/matrix-dendrite.nix
+++ b/nixos/modules/services/misc/matrix-dendrite.nix
@@ -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}"
diff --git a/pkgs/servers/matrix-dendrite/default.nix b/pkgs/servers/dendrite/default.nix
similarity index 100%
rename from pkgs/servers/matrix-dendrite/default.nix
rename to pkgs/servers/dendrite/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18430aaa1218..0767b7f9cba8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };