diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 21:36:49 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 21:36:49 +0200 |
| commit | 7a61788bc1d535213608a6f8d6b195f9a5519820 (patch) | |
| tree | 1ab06737aaabedf09c8b58234e39c0e3efc71d39 /pkgs/servers | |
| parent | d4dde073fd9d59f104d295df32f60ad8d56889ea (diff) | |
| parent | d316088c5b0b4e7ea27439c62aea60162c9bd0c4 (diff) | |
| download | nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.gz nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.bz2 nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.lz nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.xz nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.tar.zst nixlib-7a61788bc1d535213608a6f8d6b195f9a5519820.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/inginious/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 12d6f8996ad4..06594885dbc2 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -44,8 +44,8 @@ in { tomcat85 = common { versionMajor = "8"; - versionMinor = "5.11"; - sha256 = "0i1xvgpj4l4agc8vxrnfm127w4mc33pyl8963pwpklqpdk4shcjn"; + versionMinor = "5.14"; + sha256 = "0dls16lw7yak3s6cwwcccfg0qb5g8s36waxlg8wgjk8vc57h316w"; }; tomcatUnstable = common { diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix index ae3347c9671a..e09a9f740982 100644 --- a/pkgs/servers/inginious/default.nix +++ b/pkgs/servers/inginious/default.nix @@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication rec { ''; propagatedBuildInputs = with pythonPackages; [ - requests2 + requests cgroup-utils docker_1_7_2 docutils PyLTI mock pygments pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib websocket_client watchdog webpy-custom flup diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 85ebb5a80431..f6b21149a8c5 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 - pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 + 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 |