From bc561526d119d6faf6edf0582a78474580713910 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 11 Jan 2019 10:33:07 +0100
Subject: [PATCH] matrix-synapse: 0.34.0.1 -> 0.34.1.1
Also correctly run tests.
---
pkgs/servers/matrix-synapse/default.nix | 28 ++++++-------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 85794d2b6ee3..e9d6ab235a8c 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -5,20 +5,6 @@
with python2.pkgs;
let
- matrix-angular-sdk = buildPythonPackage rec {
- pname = "matrix-angular-sdk";
- version = "0.6.8";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
- };
-
- # no checks from Pypi but as this is abandonware, there will be no
- # new version anyway
- doCheck = false;
- };
-
matrix-synapse-ldap3 = buildPythonPackage rec {
pname = "matrix-synapse-ldap3";
version = "0.1.3";
@@ -37,11 +23,11 @@ let
in buildPythonApplication rec {
pname = "matrix-synapse";
- version = "0.34.0.1";
+ version = "0.34.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "00mj8gb8yx43frzni7xqxr52xix0vizydbmcnhjb6mnr5w6jafb7";
+ sha256 = "13jmbcabll3gk0b6yqwfwpc7aymqhpv6iririzskhm4pgbjcp3yk";
};
patches = [
@@ -58,7 +44,6 @@ in buildPythonApplication rec {
jinja2
jsonschema
lxml
- matrix-angular-sdk
matrix-synapse-ldap3
msgpack-python
netaddr
@@ -88,12 +73,11 @@ in buildPythonApplication rec {
unpaddedbase64
] ++ lib.optional enableSystemd systemd;
- # tests fail under py3 for now, but version 0.34.0 will use py3 by default
- # https://github.com/matrix-org/synapse/issues/4036
- doCheck = true;
- checkPhase = "python -m twisted.trial test";
+ checkInputs = [ mock ];
- checkInputs = [ mock setuptoolsTrial ];
+ checkPhase = ''
+ PYTHONPATH=".:$PYTHONPATH" trial tests
+ '';
meta = with stdenv.lib; {
homepage = https://matrix.org;