mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

Merge pull request #216922 from NickCao/mautrix-telegram

Browse source 
mautrix-telegram: unstable-2023-01-28 -> unstable-2023-02-16, with dependency and module updates
This commit is contained in:
Nick Cao 2023-02-20 08:56:43 +08:00 committed by GitHub
parent 39182edca4 2cf8e2f7ad
commit 902b5229e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/matrix/mautrix-telegram.nix
View file

@ -137,7 +137,7 @@ in {
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
path = [ pkgs.lottieconverter ];
path = [ pkgs.lottieconverter pkgs.ffmpeg-full ];
# mautrix-telegram tries to generate a dotfile in the home directory of
# the running user if using a postgresql database:

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.19.3";
version = "0.19.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "mautrix";
repo = "python";
rev = "v${version}";
hash = "sha256-7nvy2/DUS2BkcyQUUG8+aT/JHcPu141e5YWOiccS6cU=";
hash = "sha256-zPcqM+Ge7K4pJD4K0MkkGdSiYvXxe0K1qbfHzVYmGx0=";
};
propagatedBuildInputs = [

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

@ -2,34 +2,33 @@
, python3
, fetchFromGitHub
, withE2BE ? true
, withHQthumbnails ? false
}:
let
python = python3.override {
packageOverrides = self: super: {
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
version = "1.27.0a7";
version = "1.28.0a1";
pname = "tulir-telethon";
src = super.fetchPypi {
inherit pname version;
sha256 = "sha256-w4WILvLvJBKf3Nlj0omTCDDD4z+b0XFlCplQ/IHwIPs=";
hash = "sha256-Kf7S5nSvedhA5RYt5rbTxBiQq6DGwHJ5uEYxd9AsYIc=";
};
doCheck = false;
});
};
};
in
python.pkgs.buildPythonPackage rec {
python.pkgs.buildPythonPackage {
pname = "mautrix-telegram";
version = "unstable-2023-01-28";
version = "unstable-2023-02-16";
disabled = python.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "mautrix";
repo = "telegram";
rev = "f12abbe03846fd5897d58572ab24b70a58b337d2";
sha256 = "sha256-5ZZ85FOmTO26q2zhAIsF7mTlN4BLNLW2dQF+0culkUM=";
rev = "354b49d9e5f91f913b5fdf9288bc631a9a34d142";
hash = "sha256-zdK/0jgw++YwSzP8qs1BqInQlFOoM63TeI1jF1AqDnk=";
};
format = "setuptools";
@ -59,9 +58,6 @@ python.pkgs.buildPythonPackage rec {
prometheus-client
# sqlite
aiosqlite
] ++ lib.optionals withHQthumbnails [
# hq_thumbnails
moviepy
] ++ lib.optionals withE2BE [
# e2be
python-olm