Merge pull request #124407 from sumnerevans/synapse-1.35.0
synapse: 1.34.0 -> 1.35.0
This commit is contained in:
commit
ba87da5164
|
@ -12,11 +12,11 @@ let
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "matrix-synapse";
|
pname = "matrix-synapse";
|
||||||
version = "1.34.0";
|
version = "1.35.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw=";
|
sha256 = "sha256-McgLJoOS8h8C7mcbLaF0hiMkfthpDRUKyB5Effzk2ds=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -27,12 +27,13 @@ buildPythonApplication rec {
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
setuptools
|
authlib
|
||||||
bcrypt
|
bcrypt
|
||||||
bleach
|
bleach
|
||||||
canonicaljson
|
canonicaljson
|
||||||
daemonize
|
daemonize
|
||||||
frozendict
|
frozendict
|
||||||
|
ijson
|
||||||
jinja2
|
jinja2
|
||||||
jsonschema
|
jsonschema
|
||||||
lxml
|
lxml
|
||||||
|
@ -44,20 +45,20 @@ buildPythonApplication rec {
|
||||||
psutil
|
psutil
|
||||||
psycopg2
|
psycopg2
|
||||||
pyasn1
|
pyasn1
|
||||||
|
pyjwt
|
||||||
pymacaroons
|
pymacaroons
|
||||||
pynacl
|
pynacl
|
||||||
pyopenssl
|
pyopenssl
|
||||||
pysaml2
|
pysaml2
|
||||||
pyyaml
|
pyyaml
|
||||||
requests
|
requests
|
||||||
|
setuptools
|
||||||
signedjson
|
signedjson
|
||||||
sortedcontainers
|
sortedcontainers
|
||||||
treq
|
treq
|
||||||
twisted
|
twisted
|
||||||
unpaddedbase64
|
|
||||||
typing-extensions
|
typing-extensions
|
||||||
authlib
|
unpaddedbase64
|
||||||
pyjwt
|
|
||||||
] ++ lib.optional enableSystemd systemd
|
] ++ lib.optional enableSystemd systemd
|
||||||
++ lib.optional enableRedis hiredis;
|
++ lib.optional enableRedis hiredis;
|
||||||
|
|
||||||
|
@ -66,7 +67,6 @@ buildPythonApplication rec {
|
||||||
doCheck = !stdenv.isDarwin;
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"}
|
|
||||||
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
|
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue