From 4aa2488fd1029d02f15f340ecd89b5e3d361a527 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Aug 2021 21:28:15 +0200
Subject: [PATCH 1/2] mautrix-telegram: fix crash

The previous backport of `mautrix-telegram`[1] appears to be a mistake
of mine (sorry for that!), unfortunately v0.9 isn't forward-compatible
due to a database migration, so this change can't be reversed.

The primary issue was that `telethon` was too old, so I decided to
upgrade it to 1.21 which is what I had on my 21.05-based tracking
branch while using `mautrix-telegram` anyways, so that's proven to work.

Closes #135583

[1] e1042038ac15ad7cf447fa1ed23a3746ee5d8331 / cd84b8ad8b2f64f6ccf1f27b910bcdd274585fb0
---
 pkgs/servers/mautrix-telegram/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index eba429e8cce..bb2549f939f 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -12,6 +12,13 @@ let
           sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869";
         };
       });
+      telethon = super.telethon.overridePythonAttrs (oldAttrs: rec {
+        version = "1.21.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "sha256-mTyDfvdFrd+XKifXv7oM5Riihj0aUOBzclW3ZNI+DvI=";
+        };
+      });
     };
   };
 

From 446237746752e8b29db9da124c090a6877e1d887 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Tue, 24 Aug 2021 20:26:28 +0200
Subject: [PATCH 2/2] acpi_call: 1.2.1 -> 1.2.2

(cherry picked from commit 016e8cf78c8009f65d81fbd6c32b00803f3b1f3c)
---
 pkgs/os-specific/linux/acpi-call/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index f986ed790a1..39842927c9a 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "acpi-call";
-  version = "1.2.1";
+  version = "1.2.2";
   name = "${pname}-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "acpi_call";
     rev = "v${version}";
-    sha256 = "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg";
+    sha256 = "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp";
   };
 
   hardeningDisable = [ "pic" ];