public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

matrix-synapse: factor out plugins

Browse Source 
We build plugins separately from the server now.
This commit is contained in:
Nikolay Amiantov 2019-10-03 16:59:06 +03:00 committed by zimbatm
parent e5e4d387e1
commit 9f0da72abc
No known key found for this signature in database
GPG Key ID: 71BAF6D40C1D63D7
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/servers/matrix-synapse/default.nix
View File

@ -5,23 +5,9 @@
with python3.pkgs; with python3.pkgs;
let let
matrix-synapse-ldap3 = buildPythonPackage rec { plugins = python3.pkgs.callPackage ./plugins { };
pname = "matrix-synapse-ldap3"; in
version = "0.1.4"; buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx";
};
propagatedBuildInputs = [ service-identity ldap3 twisted ];
# ldaptor is not ready for py3 yet
doCheck = !isPy3k;
checkInputs = [ ldaptor mock ];
};
in buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.14.0"; version = "1.14.0";
@ -45,7 +31,6 @@ in buildPythonApplication rec {
jinja2 jinja2
jsonschema jsonschema
lxml lxml
matrix-synapse-ldap3
msgpack msgpack
netaddr netaddr
phonenumbers phonenumbers
@ -79,12 +64,14 @@ in buildPythonApplication rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
passthru.tests = { inherit (nixosTests) matrix-synapse; };
checkPhase = '' checkPhase = ''
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
''; '';
passthru.tests = { inherit (nixosTests) matrix-synapse; };
passthru.plugins = plugins;
passthru.python = python3;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://matrix.org"; homepage = "https://matrix.org";
description = "Matrix reference homeserver"; description = "Matrix reference homeserver";

5
pkgs/servers/matrix-synapse/plugins/default.nix Normal file
View File

@ -0,0 +1,5 @@
{ callPackage }:
{
matrix-synapse-ldap3 = callPackage ./ldap3.nix { };
}

17
pkgs/servers/matrix-synapse/plugins/ldap3.nix Normal file
View File

@ -0,0 +1,17 @@
{ isPy3k, buildPythonPackage, fetchPypi, service-identity, ldap3, twisted, ldaptor, mock }:
buildPythonPackage rec {
pname = "matrix-synapse-ldap3";
version = "0.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx";
};
propagatedBuildInputs = [ service-identity ldap3 twisted ];
# ldaptor is not ready for py3 yet
doCheck = !isPy3k;
checkInputs = [ ldaptor mock ];
}

2
pkgs/top-level/all-packages.nix
View File

@ -4706,6 +4706,8 @@ in
(https://github.com/NixOS/nixpkgs/issues/76093) */ (https://github.com/NixOS/nixpkgs/issues/76093) */
matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ };
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins;
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {};
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });