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

mautrix-telegram: 0.10.2 -> 0.11.0

Browse source
This commit is contained in:
Yureka 2021-12-29 05:40:25 +01:00 committed by Yuka
parent 6c1bb77161
commit 4713109cae
2 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/servers/mautrix-telegram/0001-Re-add-entrypoint.patch
View file

@ -8,22 +8,20 @@ Subject: [PATCH 1/2] Re-add entrypoint
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 068c351..95dbf89 100644 index ea001e5..e1ca536 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -51,6 +51,12 @@ setuptools.setup( @@ -54,6 +54,12 @@ setuptools.setup(
extras_require=extras_require, extras_require=extras_require,
python_requires="~=3.6", python_requires="~=3.7",
+ entry_points={ + entry_points={
+ 'console_scripts': [ + 'console_scripts': [
+ 'mautrix-telegram=mautrix_telegram.__main__:main' + 'mautrix-telegram=mautrix_telegram.__main__:main'
+ ] + ]
+ }, + },
+ +
setup_requires=["pytest-runner"], classifiers=[
tests_require=["pytest", "pytest-asyncio", "pytest-mock"], "Development Status :: 4 - Beta",
"License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
--
2.28.0

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

@ -5,20 +5,12 @@
let let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.3.24";
src = oldAttrs.src.override {
inherit version;
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
};
});
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
version = "1.24.0a2"; version = "1.25.0a1";
pname = "tulir-telethon"; pname = "tulir-telethon";
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit pname version; inherit pname version;
sha256 = "sha256-Qbx164FwC8nhesoY2fkaKvErN8g0Ph8vGcx+Cc1AqRg="; sha256 = "sha256-TFZRmhCrQ9IccGFcYxwdbD2ReSCWZ2n33S1ank1Bn1k=";
}; };
}); });
}; };
@ -33,17 +25,17 @@ let
in python.pkgs.buildPythonPackage rec { in python.pkgs.buildPythonPackage rec {
pname = "mautrix-telegram"; pname = "mautrix-telegram";
version = "0.10.2"; version = "0.11.0";
disabled = python.pythonOlder "3.7"; disabled = python.pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mautrix"; owner = "mautrix";
repo = "telegram"; repo = "telegram";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-BYsGLyxhdjBVmnZXLC5ZjwDlWcHdUGp+DsNIOXA1/Tc="; sha256 = "sha256-s0UCl0FJWO53hvHJhpeSQVGCBKEH7COFLXFCFitpDjw=";
}; };
patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; patches = [ ./0001-Re-add-entrypoint.patch ];
postPatch = '' postPatch = ''
sed -i -e '/alembic>/d' requirements.txt sed -i -e '/alembic>/d' requirements.txt
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \