b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #145757 from Ma27/bump-mautrix-pkgs

Browse source 
mautrix-telegram: 0.10.1 -> 0.10.2, mautrix-signal: unstable-2021-08-12 -> unstable-2021-11-12, python3Packages.mautrix: 0.10.11 -> 0.11.3
This commit is contained in:
Maximilian Bosch 2021-11-17 17:17:15 +01:00 committed by GitHub
parent 4d3404ac25 cd75f6b237
commit d7f74f982f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/mautrix/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.10.11";
version = "0.11.3";
src = fetchPypi {
inherit pname version;
sha256 = "b3905fbd1381031b4c54258fdef9e99dd342c3a211abe0b827b2c480db4b1771";
sha256 = "sha256-eZ8fWemS808Hz6KoQWfMsk5WfaO+vj0kTyInhtE20Qk=";
};
propagatedBuildInputs = [

12
pkgs/servers/mautrix-signal/default.nix
View file

@ -2,13 +2,13 @@
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-signal";
version = "unstable-2021-08-12";
version = "unstable-2021-11-12";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-signal";
rev = "a592baaaa6c9ab7ec29edc84f069b9e9e2fc1b03";
sha256 = "0rvidf4ah23x8m7k7hbkwm2xrs838wnli99gh99b5hr6fqmacbwl";
owner = "mautrix";
repo = "signal";
rev = "2e57810e964c1701df2e69273c2f8cebbe021464";
sha256 = "sha256-xgn01nbY3LR4G1Yk2MgUhq116/wEhG+5vLH6HKqZE+8=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -46,7 +46,7 @@ python3.pkgs.buildPythonPackage rec {
'';
meta = with lib; {
homepage = "https://github.com/tulir/mautrix-signal";
homepage = "https://github.com/mautrix/signal";
description = "A Matrix-Signal puppeting bridge";
license = licenses.agpl3Plus;
platforms = platforms.linux;

22
pkgs/servers/mautrix-telegram/default.nix
View file

@ -12,25 +12,35 @@ let
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
};
});
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
version = "1.24.0a2";
pname = "tulir-telethon";
src = oldAttrs.src.override {
inherit pname version;
sha256 = "sha256-Qbx164FwC8nhesoY2fkaKvErN8g0Ph8vGcx+Cc1AqRg=";
};
});
};
};
# officially supported database drivers
dbDrivers = with python.pkgs; [
psycopg2
aiosqlite
# sqlite driver is already shipped with python by default
];
in python.pkgs.buildPythonPackage rec {
pname = "mautrix-telegram";
version = "0.10.1";
version = "0.10.2";
disabled = python.pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
owner = "mautrix";
repo = "telegram";
rev = "v${version}";
sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c=";
sha256 = "sha256-BYsGLyxhdjBVmnZXLC5ZjwDlWcHdUGp+DsNIOXA1/Tc=";
};
patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ];
@ -49,7 +59,7 @@ in python.pkgs.buildPythonPackage rec {
CommonMark
ruamel-yaml
python_magic
telethon
tulir-telethon
telethon-session-sqlalchemy
pillow
lxml
@ -87,7 +97,7 @@ in python.pkgs.buildPythonPackage rec {
];
meta = with lib; {
homepage = "https://github.com/tulir/mautrix-telegram";
homepage = "https://github.com/mautrix/telegram";
description = "A Matrix-Telegram hybrid puppeting/relaybot bridge";
license = licenses.agpl3Plus;
platforms = platforms.linux;