danio
/
nixos-matrix-modules
mirror of https://github.com/dali99/nixos-matrix-modules.git
1
1
Fork 0
Code Issues Releases Activity

update to 23.11

This commit is contained in:
Daniel Lovbrotte Olsen 2023-12-01 06:07:53 +01:00
parent e098146571
commit a24a5e5da4
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MIGRATIONS.MD
View File

@ -4,7 +4,7 @@ This is a best effort document descibing neccecary changes you might have to do
## 0.5.0 UNRELEASED ## 0.5.0 UNRELEASED
The module has been renamed from `synapse` to `default` * The module has been renamed from `synapse` to `default`
* The synapse module now expects a wrapper-style package. This means the module is now incompatible with nixpkgs < 23.11.

25
synapse-module/default.nix
View File

@ -11,8 +11,22 @@ let
format = pkgs.formats.yaml {}; format = pkgs.formats.yaml {};
matrix-synapse-common-config = format.generate "matrix-synapse-common-config.yaml" cfg.settings; matrix-synapse-common-config = format.generate "matrix-synapse-common-config.yaml" cfg.settings;
pluginsEnv = cfg.package.python.buildEnv.override {
extraLibs = cfg.plugins; # TODO: Align better with the upstream module
wrapped = cfg.package.override {
inherit (cfg) plugins;
extras = [
"postgres"
"saml2"
"oidc"
"systemd"
"url-preview"
"sentry"
"jwt"
"redis"
"cache-memory"
"user-search"
];
}; };
inherit (lib) inherit (lib)
@ -33,7 +47,7 @@ in
imports = [ imports = [
./nginx.nix ./nginx.nix
(import ./workers.nix { (import ./workers.nix {
inherit matrix-lib throw' format matrix-synapse-common-config pluginsEnv; inherit matrix-lib throw' format matrix-synapse-common-config wrapped;
}) })
]; ];
@ -376,9 +390,6 @@ in
}; };
in "${cfg.package}/bin/synapse_homeserver ${flags}"; in "${cfg.package}/bin/synapse_homeserver ${flags}";
environment.PYTHONPATH =
lib.makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
serviceConfig = { serviceConfig = {
Type = "notify"; Type = "notify";
User = "matrix-synapse"; User = "matrix-synapse";
@ -390,7 +401,7 @@ in
config-path = [ matrix-synapse-common-config ] ++ cfg.extraConfigFiles; config-path = [ matrix-synapse-common-config ] ++ cfg.extraConfigFiles;
keys-directory = cfg.dataDir; keys-directory = cfg.dataDir;
}; };
in "${cfg.package}/bin/synapse_homeserver ${flags}"; in "${wrapped}/bin/synapse_homeserver ${flags}";
ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID";
Restart = "on-failure"; Restart = "on-failure";
}; };

9
synapse-module/workers.nix
View File

@ -1,6 +1,6 @@
{ matrix-synapse-common-config, { matrix-synapse-common-config,
matrix-lib, matrix-lib,
pluginsEnv, wrapped,
throw', throw',
format format
}: }:
@ -333,11 +333,6 @@ in {
wantedBy = [ "matrix-synapse.target" ]; wantedBy = [ "matrix-synapse.target" ];
after = [ "matrix-synapse.service" ]; after = [ "matrix-synapse.service" ];
requires = [ "matrix-synapse.service" ]; requires = [ "matrix-synapse.service" ];
environment = {
PYTHONPATH = lib.makeSearchPathOutput "lib" cfg.package.python.sitePackages [
pluginsEnv
];
};
serviceConfig = { serviceConfig = {
Type = "notify"; Type = "notify";
User = "matrix-synapse"; User = "matrix-synapse";
@ -355,7 +350,7 @@ in {
config-path = [ matrix-synapse-common-config (workerConfig worker) ] ++ cfg.extraConfigFiles; config-path = [ matrix-synapse-common-config (workerConfig worker) ] ++ cfg.extraConfigFiles;
keys-directory = cfg.dataDir; keys-directory = cfg.dataDir;
}; };
in "${cfg.package}/bin/synapse_worker ${flags}"; in "${wrapped}/bin/synapse_worker ${flags}";
}; };
}; };
})); }));