Commit 90b75a1f authored by Emily's avatar Emily
Browse files

python3Packages.mautrix: add `withOlm` flag 

Closes: #336052
parent 1b07c5eb

pkgs/development/python-modules/mautrix/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
  aiosqlite,

  asyncpg,

  ruamel-yaml,



  withOlm ? false,

}:



buildPythonPackage rec {
@@ -41,7 +43,7 @@ buildPythonPackage rec { 
    aiohttp

    attrs

    yarl

  ];

  ] ++ lib.optionals withOlm optional-dependencies.encryption;



  optional-dependencies = {

    detect_mimetype = [ python-magic ];
@@ -58,7 +60,9 @@ buildPythonPackage rec { 
    aiosqlite

    asyncpg

    ruamel-yaml

  ] ++ passthru.optional-dependencies.encryption;

  ];



  disabledTestPaths = lib.optionals (!withOlm) [ "mautrix/crypto/" ];



  pythonImportsCheck = [ "mautrix" ];

pkgs/servers/mautrix-facebook/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonPackage rec { 
    aiohttp

    asyncpg

    commonmark

    mautrix

    (mautrix.override { withOlm = true; })

    paho-mqtt

    pillow

    prometheus-client

pkgs/servers/mautrix-googlechat/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
    commonmark

    python-magic

    protobuf

    mautrix

    (mautrix.override { withOlm = enableE2be; })

  ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be

  ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics

  ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite;

pkgs/servers/mautrix-telegram/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ python.pkgs.buildPythonPackage rec { 
    commonmark

    aiohttp

    yarl

    mautrix

    (mautrix.override { withOlm = withE2BE; })

    tulir-telethon

    asyncpg

    mako

pkgs/tools/networking/maubot/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ let 
    propagatedBuildInputs = with python.pkgs; [

      setuptools

      # requirements.txt

      mautrix

      (mautrix.override { withOlm = encryptionSupport; })

      aiohttp

      yarl

      sqlalchemy