From 6055afbefe92ac3b26fb4339713525d546450fde Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Sat, 28 Dec 2024 13:32:24 +0800
Subject: [PATCH] biotite,weilite: fix error caused by bump
---
machines/biotite/services/synapse.nix | 4 ++++
machines/weilite/default.nix | 14 ++++----------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/machines/biotite/services/synapse.nix b/machines/biotite/services/synapse.nix
index e352495..b4c2f26 100644
--- a/machines/biotite/services/synapse.nix
+++ b/machines/biotite/services/synapse.nix
@@ -31,6 +31,10 @@ in
services.matrix-synapse = {
enable = true;
+ # TODO: Waiting for https://github.com/NixOS/nixpkgs/issues/367976
+ package = pkgs.matrix-synapse.override {
+ matrix-synapse-unwrapped = pkgs.matrix-synapse-unwrapped.overridePythonAttrs { doCheck = false; };
+ };
withJemalloc = true;
settings = {
server_name = "xiny.li";
diff --git a/machines/weilite/default.nix b/machines/weilite/default.nix
index cb5804b..d3e8de7 100644
--- a/machines/weilite/default.nix
+++ b/machines/weilite/default.nix
@@ -174,17 +174,11 @@
services.caddy = {
enable = true;
package = pkgs.caddy.withPlugins {
- caddyModules = [
- {
- repo = "github.com/caddy-dns/cloudflare";
- version = "89f16b99c18ef49c8bb470a82f895bce01cbaece";
- }
- {
- repo = "github.com/caddy-dns/dnspod";
- version = "1fd4ce87e919f47db5fa029c31ae74b9737a58af";
- }
+ plugins = [
+ "github.com/caddy-dns/cloudflare@v0.0.0-20240703190432-89f16b99c18e"
+ "github.com/caddy-dns/dnspod@v0.0.4"
];
- vendorHash = "sha256-OhOeU2+JiJyIW9WdCYq98OKckXQZ9Fn5zULz0aLsXMI=";
+ hash = "sha256-StgQx4Aqumisk4MYN6f4S/QyAHa37yTmGTdrtEeMTHg=";
};
virtualHosts."derper00.namely.icu:8443".extraConfig = ''
reverse_proxy 127.0.0.1:${toString config.services.tailscale.derper.port}