3
0
Fork 0
forked from mirrors/nixpkgs

matrix-synapse: 0.33.6 -> 0.33.8

Also reworked dependencies:
 * blist and ujson are marked as no longer needed
 * pytz has no mention throughout `git log -p` on synapse's repository
 * systemd and affinity are optional (but turned on by default)
This commit is contained in:
Léo Gaspard 2018-11-02 01:48:40 +09:00
parent 38db6fdfb9
commit bb86056575
No known key found for this signature in database
GPG key ID: 8A55848B6090F9CF

View file

@ -1,4 +1,6 @@
{ stdenv, python2Packages, fetchurl, fetchFromGitHub }: { lib, stdenv, python2Packages, fetchurl, fetchFromGitHub
, enableSystemd ? true
}:
let let
matrix-angular-sdk = python2Packages.buildPythonPackage rec { matrix-angular-sdk = python2Packages.buildPythonPackage rec {
name = "matrix-angular-sdk-${version}"; name = "matrix-angular-sdk-${version}";
@ -26,13 +28,13 @@ let
}; };
in python2Packages.buildPythonApplication rec { in python2Packages.buildPythonApplication rec {
name = "matrix-synapse-${version}"; name = "matrix-synapse-${version}";
version = "0.33.6"; version = "0.33.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matrix-org"; owner = "matrix-org";
repo = "synapse"; repo = "synapse";
rev = "v${version}"; rev = "v${version}";
sha256 = "0c1dr09f1msv6xvpmdlncx7yyj6qxnpihd93lqckd115fds12g5h"; sha256 = "122ba09xkc1x35qaajcynkjikg342259rgy81m8abz0l8mcg4mkm";
}; };
patches = [ patches = [
@ -40,16 +42,41 @@ in python2Packages.buildPythonApplication rec {
]; ];
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
blist canonicaljson daemonize dateutil frozendict pillow pyasn1 bcrypt
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests bleach
signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client canonicaljson
matrix-angular-sdk bleach netaddr jinja2 psycopg2 daemonize
psutil msgpack-python lxml matrix-synapse-ldap3 dateutil
phonenumbers jsonschema affinity bcrypt sortedcontainers treq frozendict
]; jinja2
jsonschema
lxml
matrix-angular-sdk
matrix-synapse-ldap3
msgpack-python
netaddr
phonenumbers
pillow
prometheus_client
psutil
psycopg2
pyasn1
pydenticon
pymacaroons-pynacl
pynacl
pyopenssl
pysaml2
pyyaml
requests
signedjson
sortedcontainers
treq
twisted
unpaddedbase64
] ++ lib.optional enableSystemd systemd;
# Checks fail because of Tox. doCheck = true;
doCheck = false; checkPhase = "python -m twisted.trial test";
buildInputs = with python2Packages; [ buildInputs = with python2Packages; [
mock setuptoolsTrial mock setuptoolsTrial