Unverified Commit ecc0c1b9 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: matrix-synapse: 1.133.0 -> 1.134.0 (#425448)

parents 487802de d3bc5086

nixos/modules/services/matrix/synapse.nix

+0 −3
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ let 
    "systemd"

    "postgres"

    "url-preview"

    "user-search"

  ];



  wantedExtras =
@@ -84,7 +83,6 @@ let 
    ++ lib.optional (cfg.settings ? saml2_config) "saml2"

    ++ lib.optional (cfg.settings ? redis) "redis"

    ++ lib.optional (cfg.settings ? sentry) "sentry"

    ++ lib.optional (cfg.settings ? user_directory) "user-search"

    ++ lib.optional (cfg.settings.url_preview_enabled) "url-preview"

    ++ lib.optional (cfg.settings.database.name == "psycopg2") "postgres";
@@ -674,7 +672,6 @@ in 
              "sentry"       # Error tracking and performance metrics

              "systemd"      # Provide the JournalHandler used in the default log_config

              "url-preview"  # Support for oEmbed URL previews

              "user-search"  # Support internationalized domain names in user-search

            ]

          '';

          description = ''

pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ let 
in

python3.pkgs.buildPythonApplication rec {

  pname = "matrix-synapse";

  version = "1.133.0";

  version = "1.134.0";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "element-hq";

    repo = "synapse";

    rev = "v${version}";

    hash = "sha256-SCpLM/4sxE9xA781tgjrNNXpScCQOtgKnZKq64eCay8=";

    hash = "sha256-q7+yVKFzyu8ccuroZsTSMRRKMwmr3TDojtXNx4bChTE";

  };



  patches = [
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { 


  cargoDeps = rustPlatform.fetchCargoVendor {

    inherit pname version src;

    hash = "sha256-qgQU041VlAFFgEg2RhbK6g+aike+HN0FYuvHYtufzW8=";

    hash = "sha256-BfLj+cqS6zpX2qLb+Rur4cy7CyPH2KzdXaTXpNK20DM=";

  };



  postPatch = ''
@@ -148,9 +148,6 @@ python3.pkgs.buildPythonApplication rec { 
    cache-memory = [

      pympler

    ];

    user-search = [

      pyicu

    ];

  };



  nativeCheckInputs =

pkgs/by-name/ma/matrix-synapse/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
    [

      "postgres"

      "url-preview"

      "user-search"

    ]

    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd) "systemd",

  plugins ? [ ],