aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix2
2 files changed, 7 insertions, 4 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index f18c6f83ffc9..e6266268a935 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, python3, openssl
, enableSystemd ? stdenv.isLinux, nixosTests
+, enableRedis ? false
}:
with python3.pkgs;
@@ -9,11 +10,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.21.2";
+ version = "1.23.0";
src = fetchPypi {
inherit pname version;
- sha256 = "061b2mpdzqxyks1kj3p7xmw8i4akqfd2s9vb7v8w27k2qpcw7528";
+ sha256 = "18an6nvxq2g21rq5ph3xlnkl75dmilcrz4ykdydz37hs09z6q1al";
};
patches = [
@@ -53,13 +54,15 @@ buildPythonApplication rec {
typing-extensions
authlib
pyjwt
- ] ++ lib.optional enableSystemd systemd;
+ ] ++ lib.optional enableSystemd systemd
+ ++ lib.optional enableRedis hiredis;
checkInputs = [ mock parameterized openssl ];
doCheck = !stdenv.isDarwin;
checkPhase = ''
+ ${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"}
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 36da6132423c..0f86a16aef50 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};