Unverified Commit 6ddb74a8 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #262542 from yu-re-ka/matrix-synapse-opentracing 

matrix-synapse: remove opentracing optional dependencies
parents b9337215 0288685a

nixos/modules/services/matrix/synapse.nix

+0 −2
Original line number Diff line number Diff line
@@ -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

pkgs/servers/matrix-synapse/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -113,10 +113,6 @@ python3.pkgs.buildPythonApplication rec { 
    sentry = [

      sentry-sdk

    ];

    opentracing = [

      jaeger-client

      opentracing

    ];

    jwt = [

      authlib

    ];