dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #239927 from NickCao/mautrix

Browse Source 
python3Packages.mautrix: 0.19.16 -> 0.20.0
This commit is contained in:
Nick Cao 2023-07-22 21:05:24 -06:00 committed by GitHub
commit 445fae800d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/python-modules/mautrix/default.nix
View File

@ -15,22 +15,21 @@
, pytestCheckHook , pytestCheckHook
, pytest-asyncio , pytest-asyncio
, aiosqlite , aiosqlite
, sqlalchemy
, asyncpg , asyncpg
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mautrix"; pname = "mautrix";
version = "0.19.16"; version = "0.20.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mautrix"; owner = "mautrix";
repo = "python"; repo = "python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk="; hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -57,17 +56,9 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
pytest-asyncio pytest-asyncio
aiosqlite aiosqlite
sqlalchemy
asyncpg asyncpg
] ++ passthru.optional-dependencies.encryption; ] ++ passthru.optional-dependencies.encryption;
SQLALCHEMY_SILENCE_UBER_WARNING = 1;
disabledTestPaths = [
# sqlalchemy 2 unsupported
"mautrix/client/state_store/tests/store_test.py"
];
pythonImportsCheck = [ pythonImportsCheck = [
"mautrix" "mautrix"
]; ];

23
pkgs/servers/heisenbridge/default.nix
View File

@ -1,21 +1,6 @@
{ lib, fetchFromGitHub, fetchpatch, python3 }: { lib, fetchFromGitHub, python3 }:
let python3.pkgs.buildPythonApplication rec {
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 {
pname = "heisenbridge"; pname = "heisenbridge";
version = "1.14.3"; version = "1.14.3";
@ -30,14 +15,14 @@ python.pkgs.buildPythonApplication rec {
echo "${version}" > heisenbridge/version.txt echo "${version}" > heisenbridge/version.txt
''; '';
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
irc irc
ruamel-yaml ruamel-yaml
mautrix mautrix
python-socks python-socks
]; ];
nativeCheckInputs = with python.pkgs; [ nativeCheckInputs = with python3.pkgs; [
pytestCheckHook pytestCheckHook
]; ];

7
pkgs/servers/mautrix-facebook/default.nix
View File

@ -1,20 +1,19 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, python3 , python3
, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd
}: }:
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
pname = "mautrix-facebook"; pname = "mautrix-facebook";
version = "0.4.1"; version = "unstable-2023-07-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mautrix"; owner = "mautrix";
repo = "facebook"; repo = "facebook";
rev = "v${version}"; rev = "543b50e73918918d1fabac67891dd80d97080942";
hash = "sha256-MlT8jNUpJMgaUO9ZIYjpv8l3evdFjfEOSvdAdSlOUvg="; hash = "sha256-Y6nwryPenNQa68Rh2KPUHQrv6rnapj8x19FdgLXutm8=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

8
pkgs/servers/mautrix-googlechat/default.nix
View File

@ -7,13 +7,13 @@
, enableSqlite ? true , enableSqlite ? true
}: python3.pkgs.buildPythonApplication rec { }: python3.pkgs.buildPythonApplication rec {
pname = "mautrix-googlechat"; pname = "mautrix-googlechat";
version = "unstable-2023-01-25"; version = "unstable-2023-07-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mautrix"; owner = "mautrix";
repo = "googlechat"; repo = "googlechat";
rev = "e2eb528745466468f059c506c22e500e0cd832aa"; rev = "f4cddafd474b12be09efd15c6652c04d0650458e";
sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM="; sha256 = "sha256-WMJVAX5oUdYYuXoJKk7OoERR0LJM0Er5444xwqIUTm8=";
}; };
patches = [ patches = [
@ -54,7 +54,7 @@
ruamel-yaml ruamel-yaml
commonmark commonmark
python-magic python-magic
protobuf3 protobuf
mautrix mautrix
] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be
++ lib.optionals enableMetrics passthru.optional-dependencies.metrics ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics

8
pkgs/servers/mautrix-telegram/default.nix
View File

@ -17,14 +17,6 @@ let
}; };
doCheck = false; 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 in