matrix-synapse: bump to nixos 21.05, new structure

This patches an import path for our new structure, and adjusts the build
inputs for our hacked version of matrix-synapse with a newer version of
twisted (for tls 1.3 support), which is apparently still necessary even
in nixos 21.05.

Seems to build fine (have not waited for all tests in the matrix packag;
these take ages)
This commit is contained in:
stuebinm 2021-08-26 22:55:47 +02:00
parent 13b8ae5c13
commit 2afc9befbf
No known key found for this signature in database
GPG key ID: 8FBE8AAD32FA12B7
2 changed files with 6 additions and 7 deletions

View file

@ -15,12 +15,13 @@ self: super:
matrix-synapse = super.matrix-synapse.overrideAttrs (old: {
propagatedBuildInputs = with self.python3Packages; [
setuptools
authlib
bcrypt
bleach
canonicaljson
daemonize
frozendict
ijson
jinja2
jsonschema
lxml
@ -32,22 +33,20 @@ self: super:
psutil
psycopg2
pyasn1
pyjwt
pymacaroons
pynacl
pyopenssl
pysaml2
pyyaml
requests
setuptools
signedjson
sortedcontainers
treq
twisted
unpaddedbase64
typing-extensions
authlib
pyjwt
systemd
hiredis
unpaddedbase64
];
python = self.python3;
});

View file

@ -3,7 +3,7 @@
{
networking.firewall.allowedTCPPorts = [ 80 443 ];
nixpkgs.overlays = [ (import ./../../../pkgs/matrix) ];
nixpkgs.overlays = [ (import ./../pkgs/matrix) ];
services.postgresql.enable = true;