tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
matrix-synapse: 0.18.4 -> 0.18.5
ralith.com
9 years ago
3422a771
1c50bdd9
+21
-8
2 changed files
expand all
collapse all
unified
split
pkgs
servers
matrix-synapse
default.nix
matrix-synapse.patch
+17
-4
pkgs/servers/matrix-synapse/default.nix
···
9
9
sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
10
10
};
11
11
};
12
12
+
matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec {
13
13
+
name = "matrix-synapse-ldap3-${version}";
14
14
+
version = "0.1.1";
15
15
+
16
16
+
src = fetchFromGitHub {
17
17
+
owner = "matrix-org";
18
18
+
repo = "matrix-synapse-ldap3";
19
19
+
rev = "564eb3f109ce7f1082c47d5f8efaa792d90467f1";
20
20
+
sha256 = "1mkjlvy7a3rq405m59ihkh1wq7pa4l03fp8hgwwyjnbmz25bqmbk";
21
21
+
};
22
22
+
23
23
+
propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ];
24
24
+
};
12
25
in pythonPackages.buildPythonApplication rec {
13
26
name = "matrix-synapse-${version}";
14
14
-
version = "0.18.4";
27
27
+
version = "0.18.5";
15
28
16
29
src = fetchFromGitHub {
17
30
owner = "matrix-org";
18
31
repo = "synapse";
19
32
rev = "v${version}";
20
20
-
sha256 = "0hcag9a4wd6a9q0ln5l949xr1bhmk1zrnf9vf3qi3lzxgi0rbm98";
33
33
+
sha256 = "1l9vfx08alf71323jrfjjvcb7pww613dwxskdgc1bplnva4khj4f";
21
34
};
22
35
23
36
patches = [ ./matrix-synapse.patch ];
···
25
38
propagatedBuildInputs = with pythonPackages; [
26
39
blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
27
40
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
28
28
-
service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml
41
41
+
signedjson systemd twisted ujson unpaddedbase64 pyyaml
29
42
matrix-angular-sdk bleach netaddr jinja2 psycopg2
30
30
-
ldap3 psutil msgpack lxml
43
43
+
psutil msgpack lxml matrix-synapse-ldap3
31
44
];
32
45
33
46
# Checks fail because of Tox.
+4
-4
pkgs/servers/matrix-synapse/matrix-synapse.patch
···
3
3
index 0000000..2f1d413
4
4
--- /dev/null
5
5
+++ b/homeserver
6
6
-
@@ -0,0 +1 @@
6
6
+
@@ -0,0 +1,1 @@
7
7
+synapse/app/homeserver.py
8
8
\ No newline at end of file
9
9
diff --git a/setup.py b/setup.py
10
10
-
index 9d24761..f3e6a00 100755
10
10
+
index b00c2af..c7f6e0a 100755
11
11
--- a/setup.py
12
12
+++ b/setup.py
13
13
-
@@ -85,6 +85,6 @@ setup(
13
13
+
@@ -92,6 +92,6 @@ setup(
14
14
include_package_data=True,
15
15
zip_safe=False,
16
16
long_description=long_description,
17
17
- scripts=["synctl"] + glob.glob("scripts/*"),
18
18
+ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"),
19
19
-
cmdclass={'test': Tox},
19
19
+
cmdclass={'test': TestCommand},
20
20
)