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

Merge pull request #101853 from Ma27/bump-matrix-synapse

Browse Source 
matrix-synapse: 1.21.2 -> 1.22.0
This commit is contained in:
Martin Weinelt 2020-10-28 22:01:32 +01:00 committed by GitHub
commit 41f0c4ad9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ lib, stdenv, python3, openssl { lib, stdenv, python3, openssl
, enableSystemd ? stdenv.isLinux, nixosTests , enableSystemd ? stdenv.isLinux, nixosTests
, enableRedis ? false
}: }:
with python3.pkgs; with python3.pkgs;
@ -9,11 +10,11 @@ let
in in
buildPythonApplication rec { buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.21.2"; version = "1.22.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "061b2mpdzqxyks1kj3p7xmw8i4akqfd2s9vb7v8w27k2qpcw7528"; sha256 = "0dl4a5zirrjabbfibl9vj4zb16md11kqkz2v9l299gxbwwvzqc39";
}; };
patches = [ patches = [
@ -53,13 +54,15 @@ buildPythonApplication rec {
typing-extensions typing-extensions
authlib authlib
pyjwt pyjwt
] ++ lib.optional enableSystemd systemd; ] ++ lib.optional enableSystemd systemd
++ lib.optional enableRedis hiredis;
checkInputs = [ mock parameterized openssl ]; checkInputs = [ mock parameterized openssl ];
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
checkPhase = '' checkPhase = ''
${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"}
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
''; '';