From e07d5326fa0d54e057af2295321dcbf692979031 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 21 Oct 2023 15:14:28 +0200 Subject: [PATCH 1/2] matrix-synapse: remove opentracing optional dependencies Fixes eval failure 'opentracing-2.4.0 not supported for interpreter python3.11' opentracing and jaeger-client libraries are unmaintained --- pkgs/servers/matrix-synapse/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 04077ad2c261..9de7a7e093f1 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -113,10 +113,6 @@ python3.pkgs.buildPythonApplication rec { sentry = [ sentry-sdk ]; - opentracing = [ - jaeger-client - opentracing - ]; jwt = [ authlib ]; From 0288685a4ddd1176f0dc0db99c9bb3ac24a7a752 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 22 Oct 2023 14:15:39 +0200 Subject: [PATCH 2/2] nixos/matrix-synapse: remove opentracing options --- nixos/modules/services/matrix/synapse.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index b38b35361cf0..12e27ef26ff3 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -60,7 +60,6 @@ let ++ lib.optional (cfg.settings ? oidc_providers) "oidc" ++ lib.optional (cfg.settings ? jwt_config) "jwt" ++ lib.optional (cfg.settings ? saml2_config) "saml2" - ++ lib.optional (cfg.settings ? opentracing) "opentracing" ++ lib.optional (cfg.settings ? redis) "redis" ++ lib.optional (cfg.settings ? sentry) "sentry" ++ lib.optional (cfg.settings ? user_directory) "user-search" @@ -334,7 +333,6 @@ in { [ "cache-memory" # Provide statistics about caching memory consumption "jwt" # JSON Web Token authentication - "opentracing" # End-to-end tracing support using Jaeger "oidc" # OpenID Connect authentication "postgres" # PostgreSQL database backend "redis" # Redis support for the replication stream between worker processes