diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-12-19 19:50:10 -0800 |
|---|---|---|
| committer | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-12-19 19:50:24 -0800 |
| commit | 3422a7710f43cdacb2ea4978b9c786c3fc6d54c8 (patch) | |
| tree | 812f8e8404c6c1ffb1c83b1607606745702bff81 /pkgs/servers/matrix-synapse | |
| parent | 1c50bdd928cec055d2ca842e2cf567aba2584efc (diff) | |
| download | nixlib-3422a7710f43cdacb2ea4978b9c786c3fc6d54c8.tar nixlib-3422a7710f43cdacb2ea4978b9c786c3fc6d54c8.tar.gz nixlib-3422a7710f43cdacb2ea4978b9c786c3fc6d54c8.tar.bz2 nixlib-3422a7710f43cdacb2ea4978b9c786c3fc6d54c8.tar.lz nixlib-3422a7710f43cdacb2ea4978b9c786c3fc6d54c8.tar.xz nixlib-3422a7710f43cdacb2ea4978b9c786c3fc6d54c8.tar.zst nixlib-3422a7710f43cdacb2ea4978b9c786c3fc6d54c8.zip | |
matrix-synapse: 0.18.4 -> 0.18.5
Diffstat (limited to 'pkgs/servers/matrix-synapse')
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/servers/matrix-synapse/matrix-synapse.patch | 8 |
2 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d1301fad7abc..00f9287bea53 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,15 +9,28 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; + matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec { + name = "matrix-synapse-ldap3-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-synapse-ldap3"; + rev = "564eb3f109ce7f1082c47d5f8efaa792d90467f1"; + sha256 = "1mkjlvy7a3rq405m59ihkh1wq7pa4l03fp8hgwwyjnbmz25bqmbk"; + }; + + propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ]; + }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0hcag9a4wd6a9q0ln5l949xr1bhmk1zrnf9vf3qi3lzxgi0rbm98"; + sha256 = "1l9vfx08alf71323jrfjjvcb7pww613dwxskdgc1bplnva4khj4f"; }; patches = [ ./matrix-synapse.patch ]; @@ -25,9 +38,9 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 - service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml + signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 - ldap3 psutil msgpack lxml + psutil msgpack lxml matrix-synapse-ldap3 ]; # Checks fail because of Tox. diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch index a6a393ea56c3..288e6ff16245 100644 --- a/pkgs/servers/matrix-synapse/matrix-synapse.patch +++ b/pkgs/servers/matrix-synapse/matrix-synapse.patch @@ -3,18 +3,18 @@ new file mode 120000 index 0000000..2f1d413 --- /dev/null +++ b/homeserver -@@ -0,0 +1 @@ +@@ -0,0 +1,1 @@ +synapse/app/homeserver.py \ No newline at end of file diff --git a/setup.py b/setup.py -index 9d24761..f3e6a00 100755 +index b00c2af..c7f6e0a 100755 --- a/setup.py +++ b/setup.py -@@ -85,6 +85,6 @@ setup( +@@ -92,6 +92,6 @@ setup( include_package_data=True, zip_safe=False, long_description=long_description, - scripts=["synctl"] + glob.glob("scripts/*"), + scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), - cmdclass={'test': Tox}, + cmdclass={'test': TestCommand}, ) |