Commit 343ad0ee authored by Emily's avatar Emily
Browse files

python3Packages.matrix-nio: add `withOlm` flag

parent 90b75a1f

nixos/tests/matrix/mjolnir.nix

+2 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ import ../make-test-python.nix ( 
        environment.systemPackages = [

          (pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir"

            { libraries = with pkgs.python3Packages; [

                matrix-nio

              ] ++ matrix-nio.optional-dependencies.e2e;

                (matrix-nio.override { withOlm = true; })

              ];

            } ''

            import asyncio

pkgs/applications/networking/instant-messengers/matrix-commander/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ buildPythonApplication rec { 
  propagatedBuildInputs = [

    cacert

    setuptools

    matrix-nio

    (matrix-nio.override { withOlm = true; })

    python-magic

    markdown

    pillow
@@ -51,7 +51,7 @@ buildPythonApplication rec { 
    pyxdg

    python-olm

    emoji

  ] ++ matrix-nio.optional-dependencies.e2e;

  ];



  meta = with lib; {

    description = "Simple but convenient CLI-based Matrix client app for sending and receiving";

pkgs/applications/networking/instant-messengers/pantalaimon/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -39,11 +39,10 @@ python3Packages.buildPythonApplication rec { 
    janus

    keyring

    logbook

    matrix-nio

    (matrix-nio.override { withOlm = true; })

    peewee

    prompt-toolkit

  ]

  ++ matrix-nio.optional-dependencies.e2e

  ++ lib.optionals enableDbusUi optional-dependencies.ui;



  optional-dependencies.ui = with python3Packages; [

pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ in buildPythonPackage { 
    attrs

    logbook

    pygments

    matrix-nio

    (matrix-nio.override { withOlm = true; })

    aiohttp

    requests

  ] ++ matrix-nio.optional-dependencies.e2e;

  ];



  passthru.scripts = [ "matrix.py" ];

pkgs/applications/networking/opsdroid/default.nix

+39 −42
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ python3Packages.buildPythonPackage rec { 


  build-system = with python3Packages; [ setuptools ];



  dependencies =

    with python3Packages;

    [

  dependencies = with python3Packages; [

    aiohttp

    aiohttp-middlewares

    aioredis
@@ -38,7 +36,7 @@ python3Packages.buildPythonPackage rec { 
    emoji

    get-video-properties

    ibm-watson

      matrix-nio

    (matrix-nio.override { withOlm = true; })

    mattermostdriver

    motor

    multidict
@@ -58,8 +56,7 @@ python3Packages.buildPythonPackage rec { 
    watchgod

    webexteamssdk

    wrapt

    ]

    ++ matrix-nio.optional-dependencies.e2e;

  ];



  passthru.python = python3Packages.python;