diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-11-05 09:39:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-05 09:39:16 +0100 |
commit | f825642e7435bbd1eb7c3d777999606d8d628ce1 (patch) | |
tree | 57960d96806f77b5944bd83997331c65fa9253dc /pkgs/servers | |
parent | 316de025d1cd2d12c0a2a6b8b61b8a70a293fe9b (diff) | |
parent | 11d3143f91df02a9c3cc19f6d8fd4f8a283b97a3 (diff) | |
download | nixlib-f825642e7435bbd1eb7c3d777999606d8d628ce1.tar nixlib-f825642e7435bbd1eb7c3d777999606d8d628ce1.tar.gz nixlib-f825642e7435bbd1eb7c3d777999606d8d628ce1.tar.bz2 nixlib-f825642e7435bbd1eb7c3d777999606d8d628ce1.tar.lz nixlib-f825642e7435bbd1eb7c3d777999606d8d628ce1.tar.xz nixlib-f825642e7435bbd1eb7c3d777999606d8d628ce1.tar.zst nixlib-f825642e7435bbd1eb7c3d777999606d8d628ce1.zip |
Merge pull request #30266 from Ralith/matrix-synapse
matrix-synapse: 0.22.1 -> 0.24.1
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c7c33928714b..73498e5b8844 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ { lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = pythonPackages.buildPythonApplication rec { + matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; version = "0.6.8"; @@ -9,7 +9,7 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; - matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec { + matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec { name = "matrix-synapse-ldap3-${version}"; version = "0.1.2"; @@ -24,24 +24,24 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.22.1"; + version = "0.24.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7"; + sha256 = "08w8sawq0nj28dzi9wc4rsg9z2qv528djj4zbcs5c4yc3mylq1nq"; }; patches = [ ./matrix-synapse.patch ]; propagatedBuildInputs = with pythonPackages; [ - blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 + blist canonicaljson daemonize dateutil frozendict pillow pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack lxml matrix-synapse-ldap3 - phonenumbers jsonschema + phonenumbers jsonschema affinity bcrypt ]; # Checks fail because of Tox. |