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

Merge: matrix-synapse-unwrapped: 1.129.0 -> 1.130.0 (#409255)

parents b72ff2f5 088fc2ba
Loading
Loading
Loading
Loading
+3 −13
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  python3,
  openssl,
  libiconv,
@@ -18,31 +17,22 @@ let
in
python3.pkgs.buildPythonApplication rec {
  pname = "matrix-synapse";
  version = "1.129.0";
  version = "1.130.0";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "element-hq";
    repo = "synapse";
    rev = "v${version}";
    hash = "sha256-JDaTFbRb2eNtzxZBLn8wOBEN5uJcInNrhFnGFZjI8is=";
    hash = "sha256-/rPVJvIJfPMV+8hMenNF2dJzgemhaD2Z+/G4+6d7r1k=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src;
    name = "${pname}-${version}";
    hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM=";
    hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
  };

  patches = [
    # fix compatibility with authlib 1.5.2
    # https://github.com/element-hq/synapse/pull/18390
    (fetchpatch {
      url = "https://github.com/element-hq/synapse/commit/c9adbc6a1ce6039b1c04ae3298e463a3e3b25c38.patch";
      hash = "sha256-0EZL0esZ6IEjmBV1whSpfZoFsMJ2yZQPi1GjW7NQ484=";
    })
  ];

  postPatch = ''
    # Remove setuptools_rust from runtime dependencies
    # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185