public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21296 from Ralith/matrix-synapse

Browse Source 
matrix-synapse: 0.18.4 -> 0.18.5
This commit is contained in:
Frederik Rietdijk 2016-12-20 09:26:12 +01:00 committed by GitHub
commit fd5a6b8efc
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/servers/matrix-synapse/default.nix
View File

@ -9,15 +9,28 @@ let
sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; 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 { in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}"; name = "matrix-synapse-${version}";
version = "0.18.4"; version = "0.18.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matrix-org"; owner = "matrix-org";
repo = "synapse"; repo = "synapse";
rev = "v${version}"; rev = "v${version}";
sha256 = "0hcag9a4wd6a9q0ln5l949xr1bhmk1zrnf9vf3qi3lzxgi0rbm98"; sha256 = "1l9vfx08alf71323jrfjjvcb7pww613dwxskdgc1bplnva4khj4f";
}; };
patches = [ ./matrix-synapse.patch ]; patches = [ ./matrix-synapse.patch ];
@ -25,9 +38,9 @@ in pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 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 matrix-angular-sdk bleach netaddr jinja2 psycopg2
ldap3 psutil msgpack lxml psutil msgpack lxml matrix-synapse-ldap3
]; ];
# Checks fail because of Tox. # Checks fail because of Tox.

8
pkgs/servers/matrix-synapse/matrix-synapse.patch
View File

@ -3,18 +3,18 @@ new file mode 120000
index 0000000..2f1d413 index 0000000..2f1d413
--- /dev/null --- /dev/null
+++ b/homeserver +++ b/homeserver
@@ -0,0 +1 @@ @@ -0,0 +1,1 @@
+synapse/app/homeserver.py +synapse/app/homeserver.py
\ No newline at end of file \ No newline at end of file
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 9d24761..f3e6a00 100755 index b00c2af..c7f6e0a 100755
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -85,6 +85,6 @@ setup( @@ -92,6 +92,6 @@ setup(
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
long_description=long_description, long_description=long_description,
- scripts=["synctl"] + glob.glob("scripts/*"), - scripts=["synctl"] + glob.glob("scripts/*"),
+ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), + scripts=["synctl", "homeserver"] + glob.glob("scripts/*"),
cmdclass={'test': Tox}, cmdclass={'test': TestCommand},
) )