Skip to content

Commit 5df4362

Browse files
authored
Merge: matrix-synapse: 1.121.1 -> 1.122.0 (NixOS#373782)
2 parents 32deaa0 + f912b94 commit 5df4362

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

pkgs/servers/matrix-synapse/default.nix

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
rustc,
1111
nixosTests,
1212
callPackage,
13-
fetchpatch2,
1413
}:
1514

1615
let
@@ -19,31 +18,22 @@ let
1918
in
2019
python3.pkgs.buildPythonApplication rec {
2120
pname = "matrix-synapse";
22-
version = "1.121.1";
21+
version = "1.122.0";
2322
format = "pyproject";
2423

2524
src = fetchFromGitHub {
2625
owner = "element-hq";
2726
repo = "synapse";
2827
rev = "v${version}";
29-
hash = "sha256-0sLzngo6jBpKyqgw8XwgPzpmSWR7pjXT58XcDJCUq0s=";
28+
hash = "sha256-pucGVKEjQNihlHmFxhgJSiX7sxpQYrCpSwhZByBtbe8=";
3029
};
3130

3231
cargoDeps = rustPlatform.fetchCargoTarball {
3332
inherit src;
3433
name = "${pname}-${version}";
35-
hash = "sha256-LGFuz3NtNqH+XumJOirvflH0fyfTtqz5qgYlJx2fmAU=";
34+
hash = "sha256-AZi3QIPHqfxfCGcZAAD0rzmzLH6tUxhuq+Tc38qdUKc=";
3635
};
3736

38-
patches = [
39-
# Fixes test compat with twisted 24.11.0.
40-
# Can be removed in next release.
41-
(fetchpatch2 {
42-
url = "https://github.com/element-hq/synapse/commit/3eb92369ca14012a07da2fbf9250e66f66afb710.patch";
43-
sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A=";
44-
})
45-
];
46-
4737
postPatch = ''
4838
# Remove setuptools_rust from runtime dependencies
4939
# https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185

0 commit comments

Comments
 (0)