Merge pull request 'fix mautrix-telegram' (#323) from fix-mt into main

Reviewed-on: #323
This commit is contained in:
Charlotte 🦝 Delenk 2023-09-26 07:51:27 +00:00
commit f04222307e
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558

View file

@ -4,11 +4,25 @@
fetchFromGitHub, fetchFromGitHub,
}: let }: let
source = builtins.fromJSON (builtins.readFile ./source.json); source = builtins.fromJSON (builtins.readFile ./source.json);
python = python3.override {
packageOverrides = self: super: {
dask = super.dask.overridePythonAttrs (_: {
installCheckPhase = "true";
});
pyarrow = super.pyarrow.overridePythonAttrs (old: {
installCheckPhase = "true";
});
tifffile = super.tifffile.overridePythonAttrs (old: {
installCheckPhase = "true";
});
};
};
in in
python3.pkgs.buildPythonPackage rec { python.pkgs.buildPythonPackage rec {
pname = "mautrix-telegram"; pname = "mautrix-telegram";
version = source.date; version = source.date;
disabled = python3.pythonOlder "3.8"; disabled = python.pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mautrix"; owner = "mautrix";
@ -23,14 +37,14 @@ in
--replace "asyncpg>=0.20,<0.27" "asyncpg>=0.20" --replace "asyncpg>=0.20,<0.27" "asyncpg>=0.20"
''; '';
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python.pkgs; [
ruamel-yaml ruamel-yaml
python-magic python-magic
CommonMark CommonMark
aiohttp aiohttp
yarl yarl
(python3.pkgs.callPackage ../../python/mautrix.nix {}) (python.pkgs.callPackage ../../python/mautrix.nix {})
(python3.pkgs.callPackage ../../python/tulir-telethon.nix {}) (python.pkgs.callPackage ../../python/tulir-telethon.nix {})
asyncpg asyncpg
Mako Mako
# optional # optional
@ -58,7 +72,7 @@ in
description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge";
license = licenses.agpl3Plus; license = licenses.agpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
broken = !(python3.pkgs ? cryptg); broken = !(python.pkgs ? cryptg);
}; };
passthru.updateScript = [ passthru.updateScript = [
../../scripts/update-git.sh ../../scripts/update-git.sh