diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/servers/matrix-synapse/default.nix | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/servers/matrix-synapse/default.nix')
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index a321f609df8..b2e61d50656 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,19 +1,22 @@ { lib, stdenv, python3, openssl , enableSystemd ? stdenv.isLinux, nixosTests +, enableRedis ? false +, callPackage }: with python3.pkgs; let plugins = python3.pkgs.callPackage ./plugins { }; + tools = callPackage ./tools { }; in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.0"; + version = "1.38.1"; src = fetchPypi { inherit pname version; - sha256 = "1fl9p0cb442271hx7zjz8vp111xgvdpn4khk8bk3kl8z9hjs2l1p"; + sha256 = "sha256-bGKGzhuDjKaNbjXSwvidk9SrRmJsLQyLe5jps4DXN+s="; }; patches = [ @@ -21,13 +24,16 @@ buildPythonApplication rec { ./homeserver-script.patch ]; + buildInputs = [ openssl ]; + propagatedBuildInputs = [ - setuptools + authlib bcrypt bleach canonicaljson daemonize frozendict + ijson jinja2 jsonschema lxml @@ -35,31 +41,26 @@ buildPythonApplication rec { netaddr phonenumbers pillow - (prometheus_client.overrideAttrs (x: { - src = fetchPypi { - pname = "prometheus_client"; - version = "0.3.1"; - sha256 = "093yhvz7lxl7irnmsfdnf2030lkj4gsfkg6pcmy4yr1ijk029g0p"; - }; - })) + prometheus_client psutil psycopg2 pyasn1 + pyjwt pymacaroons pynacl pyopenssl pysaml2 pyyaml requests + setuptools signedjson sortedcontainers treq twisted - unpaddedbase64 typing-extensions - authlib - pyjwt - ] ++ lib.optional enableSystemd systemd; + unpaddedbase64 + ] ++ lib.optional enableSystemd systemd + ++ lib.optionals enableRedis [ hiredis txredisapi ]; checkInputs = [ mock parameterized openssl ]; @@ -71,9 +72,10 @@ buildPythonApplication rec { passthru.tests = { inherit (nixosTests) matrix-synapse; }; passthru.plugins = plugins; + passthru.tools = tools; passthru.python = python3; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://matrix.org"; description = "Matrix reference homeserver"; license = licenses.asl20; |