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

Merge pull request #272875 from chayleaf/maubot

Browse Source 
nixos/maubot: fix eval with default config
This commit is contained in:
Weijia Wang 2023-12-08 16:23:20 +01:00 committed by GitHub
commit 6f6d03b284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/matrix/maubot.nix
View File

@ -42,7 +42,7 @@ let
database = lib.last (lib.splitString "/" noSchema); database = lib.last (lib.splitString "/" noSchema);
}; };
postgresDBs = [ postgresDBs = builtins.filter isPostgresql [
cfg.settings.database cfg.settings.database
cfg.settings.crypto_database cfg.settings.crypto_database
cfg.settings.plugin_databases.postgres cfg.settings.plugin_databases.postgres

2
pkgs/tools/networking/maubot/wrapper.nix
View File

@ -39,7 +39,7 @@ let wrapper = { pythonPackages ? (_: [ ]), plugins ? (_: [ ]), baseConfig ? null
if builtins.isNull (baseConfig.server.override_resource_path or null) if builtins.isNull (baseConfig.server.override_resource_path or null)
then "${unwrapped}/${python3.sitePackages}/maubot/management/frontend/build" then "${unwrapped}/${python3.sitePackages}/maubot/management/frontend/build"
else baseConfig.server.override_resource_path; else baseConfig.server.override_resource_path;
})})} $out/${python3.sitePackages}/maubot/example-config.yaml })} $out/${python3.sitePackages}/maubot/example-config.yaml
rm -rf $out/bin rm -rf $out/bin
''} ''}
mkdir -p $out/bin mkdir -p $out/bin