summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-08-21 00:06:56 +0200
committerGitHub <noreply@github.com>2021-08-21 00:06:56 +0200
commitb86db7692ff39830d314e99265ed2bd90001f7ea (patch)
treead14000aa4055a657a081a0f40f3091de4b090f1
parentMerge pull request #134947 from NixOS/backport-134692-to-release-21.05 (diff)
parentmautrix-telegram: override mautrix to version 0.10.4 (diff)
downloadnixpkgs-b86db7692ff39830d314e99265ed2bd90001f7ea.tar.gz
Merge pull request #134933 from Ma27/backport-mautrix-telegram
[21.05] mautrix telegram: 0.10.0 -> 0.10.1
-rw-r--r--pkgs/servers/mautrix-telegram/default.nix26
1 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 74280f048ce9..eba429e8cce0 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -2,30 +2,42 @@
, withE2BE ? true
}:
-with python3.pkgs;
-
let
+ python = python3.override {
+ packageOverrides = self: super: {
+ mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
+ version = "0.10.4";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869";
+ };
+ });
+ };
+ };
+
# officially supported database drivers
- dbDrivers = [
+ dbDrivers = with python.pkgs; [
psycopg2
# sqlite driver is already shipped with python by default
];
-in buildPythonPackage rec {
+in with python.pkgs; buildPythonPackage rec {
pname = "mautrix-telegram";
- version = "0.9.0";
- disabled = pythonOlder "3.7";
+ version = "0.10.1";
+ disabled = python.pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
rev = "v${version}";
- sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn";
+ sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c=";
};
patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ];
postPatch = ''
sed -i -e '/alembic>/d' requirements.txt
+ substituteInPlace requirements.txt \
+ --replace "telethon>=1.22,<1.23" "telethon"
'';
propagatedBuildInputs = [