chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into production

Browse Source
This commit is contained in:
陈浩南
2024-02-03 20:52:43 +08:00
parent 21e8b5300a abdf3f5f0b
commit 43e8215fc6
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devices/vps7/default.nix
View File

@@ -59,7 +59,6 @@ inputs:
fz-new-order.enable = true;
nginx.applications = { kkmeeting.enable = true; webdav.instances."webdav.chn.moe" = {}; };
httpapi.enable = true;
mastodon.enable = true;
gitea.enable = true;
grafana.enable = true;
fail2ban.enable = true;

10
modules/services/mastodon.nix
View File

@@ -12,16 +12,6 @@ inputs:
inherit (builtins) toString;
in mkIf mastodon.enable
{
# TODO: remove in next release
nixpkgs.overlays = [(final: prev: { mastodon = prev.mastodon.override
{
version = "4.2.5";
patches = prev.patches or [] ++ [(final.fetchpatch
{
url = "https://github.com/mastodon/mastodon/compare/v4.2.4...v4.2.5.patch";
hash = "sha256-CtzYV1i34s33lV/1jeNcr9p/x4Es1zRaf4l1sNWVKYk=";
})];
};})];
services.mastodon =
{
enable = true;