about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2016-01-27 13:19:00 +0100
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2016-01-27 13:19:00 +0100
commite366168d2237b29f5107b47d628b6d40727337b5 (patch)
tree9c54681e6c94553c5532a3e6d80e37aa8c174ef1 /pkgs/servers
parent94b8871938183c2f150628d29a74feb387285910 (diff)
parentef4f65293bf859e1105699d204c49b0415a9c0d0 (diff)
downloadnixlib-e366168d2237b29f5107b47d628b6d40727337b5.tar
nixlib-e366168d2237b29f5107b47d628b6d40727337b5.tar.gz
nixlib-e366168d2237b29f5107b47d628b6d40727337b5.tar.bz2
nixlib-e366168d2237b29f5107b47d628b6d40727337b5.tar.lz
nixlib-e366168d2237b29f5107b47d628b6d40727337b5.tar.xz
nixlib-e366168d2237b29f5107b47d628b6d40727337b5.tar.zst
nixlib-e366168d2237b29f5107b47d628b6d40727337b5.zip
Merge pull request #12552 from NixOS/python-wip
pythonPackages: update setuptools, many updates and fixes
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/matrix-synapse/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 66d9e7258f4c..714ff9d002c8 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = with pythonPackages; [
     blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
     pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
-    service-identity signedjson systemd twisted15 ujson unpaddedbase64 pyyaml
+    service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml
     matrix-angular-sdk
   ];