diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index b97730fbd4d1..4b83afc5d31a 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -15,22 +15,21 @@ , pytestCheckHook , pytest-asyncio , aiosqlite -, sqlalchemy , asyncpg }: buildPythonPackage rec { pname = "mautrix"; - version = "0.19.16"; + version = "0.20.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk="; + hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; }; propagatedBuildInputs = [ @@ -57,17 +56,9 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio aiosqlite - sqlalchemy asyncpg ] ++ passthru.optional-dependencies.encryption; - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - - disabledTestPaths = [ - # sqlalchemy 2 unsupported - "mautrix/client/state_store/tests/store_test.py" - ]; - pythonImportsCheck = [ "mautrix" ]; diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index b983e60a6aaa..31b535795a5f 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,21 +1,6 @@ -{ lib, fetchFromGitHub, fetchpatch, python3 }: +{ lib, fetchFromGitHub, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.16.10"; - src = fetchFromGitHub { - owner = "mautrix"; - repo = "python"; - rev = "v${version}"; - hash = "sha256-YQsQ7M+mHcRdGUZp+mo46AlBmKSdmlgRdGieEG0Hu9k="; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; version = "1.14.3"; @@ -30,14 +15,14 @@ python.pkgs.buildPythonApplication rec { echo "${version}" > heisenbridge/version.txt ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ irc ruamel-yaml mautrix python-socks ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 178da1e6ada7..e638886bc20f 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -1,20 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , python3 , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd }: python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "0.4.1"; + version = "unstable-2023-07-16"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; - rev = "v${version}"; - hash = "sha256-MlT8jNUpJMgaUO9ZIYjpv8l3evdFjfEOSvdAdSlOUvg="; + rev = "543b50e73918918d1fabac67891dd80d97080942"; + hash = "sha256-Y6nwryPenNQa68Rh2KPUHQrv6rnapj8x19FdgLXutm8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index e9431215b3b1..b522dc0636f6 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -7,13 +7,13 @@ , enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "unstable-2023-01-25"; + version = "unstable-2023-07-16"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "e2eb528745466468f059c506c22e500e0cd832aa"; - sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM="; + rev = "f4cddafd474b12be09efd15c6652c04d0650458e"; + sha256 = "sha256-WMJVAX5oUdYYuXoJKk7OoERR0LJM0Er5444xwqIUTm8="; }; patches = [ @@ -54,7 +54,7 @@ ruamel-yaml commonmark python-magic - protobuf3 + protobuf mautrix ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index f2ef7060eabb..6caff9c3e3d0 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -17,14 +17,6 @@ let }; doCheck = false; }); - mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.20.0"; - src = oldAttrs.src.override { - rev = "refs/tags/v${version}"; - hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; - }; - doCheck = false; - }); }; }; in