diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-03-04 15:25:54 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2022-03-04 15:25:54 +0800 |
| commit | 12f9b166d738fd13c4da483bf3c0d27776b82a2e (patch) | |
| tree | 2a28c41168c1133086136e0d1cad1391d27d0f69 /pkgs/servers | |
| parent | 2f6a957617a95403221fb646d27ebc760408a04c (diff) | |
| download | nixpkgs-12f9b166d738fd13c4da483bf3c0d27776b82a2e.tar nixpkgs-12f9b166d738fd13c4da483bf3c0d27776b82a2e.tar.gz nixpkgs-12f9b166d738fd13c4da483bf3c0d27776b82a2e.tar.bz2 nixpkgs-12f9b166d738fd13c4da483bf3c0d27776b82a2e.tar.lz nixpkgs-12f9b166d738fd13c4da483bf3c0d27776b82a2e.tar.xz nixpkgs-12f9b166d738fd13c4da483bf3c0d27776b82a2e.tar.zst nixpkgs-12f9b166d738fd13c4da483bf3c0d27776b82a2e.zip | |
mautrix-telegram: 0.11.1 -> 0.11.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch | 24 | ||||
| -rw-r--r-- | pkgs/servers/mautrix-telegram/default.nix | 13 |
2 files changed, 4 insertions, 33 deletions
diff --git a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch b/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch deleted file mode 100644 index f1ec3e622cf..00000000000 --- a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch +++ /dev/null @@ -1,24 +0,0 @@ -From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sun, 29 Nov 2020 20:55:17 +0100 -Subject: [PATCH 2/2] Don't depend on pytest-runner - ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 95dbf89..89ea2a7 100644 ---- a/setup.py -+++ b/setup.py -@@ -57,7 +57,6 @@ setuptools.setup( - ] - }, - -- setup_requires=["pytest-runner"], - tests_require=["pytest", "pytest-asyncio", "pytest-mock"], - - classifiers=[ --- -2.28.0 - diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 267f89182fb..e96427f30f3 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -6,11 +6,11 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.25.0a3"; + version = "1.25.0a5"; pname = "tulir-telethon"; src = oldAttrs.src.override { inherit pname version; - sha256 = "sha256-/kau9Q2+7giVx52tmjvYIbcDcY1/om31X9BlRvZipuk="; + sha256 = "sha256-WFiWczuw6eVVid2Z1LsnGE6BCEhqeCuiQ/p0d2Ahbi8="; }; }); }; @@ -25,22 +25,17 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.11.1"; + version = "0.11.2"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-Df+v1Q+5Iaa9GKcwIabMKjJwmVd5Qub8M54jEEiAPFc="; + sha256 = "sha256-ZECTHAP5l9tAk9Ies8XuPpH9jqYDJSRSHVKz1lA6Sjg="; }; patches = [ ./0001-Re-add-entrypoint.patch ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "telethon>=1.22,<1.23" "telethon" - ''; - propagatedBuildInputs = with python.pkgs; ([ Mako |