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

Merge: matrix-synapse: 1.121.1 -> 1.122.0 (#373782)

parents 32deaa0f f912b947

pkgs/servers/matrix-synapse/default.nix

+3 −13
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
  rustc,

  nixosTests,

  callPackage,

  fetchpatch2,

}:



let
@@ -19,31 +18,22 @@ let 
in

python3.pkgs.buildPythonApplication rec {

  pname = "matrix-synapse";

  version = "1.121.1";

  version = "1.122.0";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "element-hq";

    repo = "synapse";

    rev = "v${version}";

    hash = "sha256-0sLzngo6jBpKyqgw8XwgPzpmSWR7pjXT58XcDJCUq0s=";

    hash = "sha256-pucGVKEjQNihlHmFxhgJSiX7sxpQYrCpSwhZByBtbe8=";

  };



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-LGFuz3NtNqH+XumJOirvflH0fyfTtqz5qgYlJx2fmAU=";

    hash = "sha256-AZi3QIPHqfxfCGcZAAD0rzmzLH6tUxhuq+Tc38qdUKc=";

  };



  patches = [

    # Fixes test compat with twisted 24.11.0.

    # Can be removed in next release.

    (fetchpatch2 {

      url = "https://github.com/element-hq/synapse/commit/3eb92369ca14012a07da2fbf9250e66f66afb710.patch";

      sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A=";

    })

  ];



  postPatch = ''

    # Remove setuptools_rust from runtime dependencies

    # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185