summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-10-28 21:05:22 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2020-10-28 21:05:22 +0100
commitff9487703e1a7ceacfbddbfe17d67a74c9d5d524 (patch)
tree4535dc24f2d083fbdc31ac6e75701c2c20667916 /pkgs/servers
parent2e2eea4338ddf0cdb1bd588420c738f32942267e (diff)
downloadnixpkgs-ff9487703e1a7ceacfbddbfe17d67a74c9d5d524.tar
nixpkgs-ff9487703e1a7ceacfbddbfe17d67a74c9d5d524.tar.gz
nixpkgs-ff9487703e1a7ceacfbddbfe17d67a74c9d5d524.tar.bz2
nixpkgs-ff9487703e1a7ceacfbddbfe17d67a74c9d5d524.tar.lz
nixpkgs-ff9487703e1a7ceacfbddbfe17d67a74c9d5d524.tar.xz
nixpkgs-ff9487703e1a7ceacfbddbfe17d67a74c9d5d524.tar.zst
nixpkgs-ff9487703e1a7ceacfbddbfe17d67a74c9d5d524.zip
matrix-synapse: make dependency for `hiredis` optional
This is only needed for replication which isn't even supported by the
current NixOS module.
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/matrix-synapse/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 4aff6058706..04700a9e209 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, python3, openssl
 , enableSystemd ? stdenv.isLinux, nixosTests
+, enableRedis ? false
 }:
 
 with python3.pkgs;
@@ -53,14 +54,15 @@ buildPythonApplication rec {
     typing-extensions
     authlib
     pyjwt
-    hiredis
-  ] ++ 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
   '';