pyrox.dev
lol
Merge pull request #193200 from mweinelt/matrix-synapse-1.68.0
matrix-synapse: 1.67.0 -> 1.68.0
authored by
Maximilian Bosch
and committed by
GitHub
27f51fd5
1acde3a7
+32
-3
pkgs/servers/matrix-synapse/default.nix
+32
-3
pkgs/servers/matrix-synapse/default.nix
···
1
-
{ lib, stdenv, python3, openssl
1
+
{ lib, stdenv, python3, openssl, rustPlatform
2
2
, enableSystemd ? stdenv.isLinux, nixosTests
3
3
, enableRedis ? true
4
4
, callPackage
···
11
11
with python3.pkgs;
12
12
buildPythonApplication rec {
13
13
pname = "matrix-synapse";
14
-
version = "1.67.0";
14
+
version = "1.68.0";
15
+
format = "pyproject";
15
16
16
17
src = fetchPypi {
17
18
inherit pname version;
18
-
sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY=";
19
+
hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM=";
19
20
};
20
21
22
+
cargoDeps = rustPlatform.fetchCargoTarball {
23
+
inherit src;
24
+
name = "${pname}-${version}";
25
+
hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo=";
26
+
};
27
+
28
+
postPatch = ''
29
+
# Remove setuptools_rust from runtime dependencies
30
+
# https://github.com/matrix-org/synapse/blob/v1.68.0/pyproject.toml#L177-L185
31
+
sed -i '/^setuptools_rust =/d' pyproject.toml
32
+
'';
33
+
34
+
nativeBuildInputs = [
35
+
poetry-core
36
+
rustPlatform.cargoSetupHook
37
+
setuptools-rust
38
+
] ++ (with rustPlatform.rust; [
39
+
cargo
40
+
rustc
41
+
]);
42
+
21
43
buildInputs = [ openssl ];
22
44
23
45
propagatedBuildInputs = [
···
63
85
doCheck = !stdenv.isDarwin;
64
86
65
87
checkPhase = ''
88
+
runHook preCheck
89
+
90
+
# remove src module, so tests use the installed module instead
91
+
rm -rf ./synapse
92
+
66
93
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
94
+
95
+
runHook postCheck
67
96
'';
68
97
69
98
passthru.tests = { inherit (nixosTests) matrix-synapse; };