From 41728e065f81581ccbf5007006a20809f3c9e307 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 11:41:05 +0900
Subject: [PATCH 1/2] python312Packages.matrix-client: refactor

---
 .../python-modules/matrix-client/default.nix    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
index 034a1745b990..fa2445662c06 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -5,21 +5,26 @@
   pytestCheckHook,
   requests,
   responses,
+  setuptools,
   urllib3,
 }:
 
 buildPythonPackage rec {
   pname = "matrix-client";
   version = "0.4.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "matrix_client";
     inherit version;
-    sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06";
+    hash = "sha256-BnivQPLLLwkoqQikEMApdH1Ay5YaxaPxvQWqNVY8MVY=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  pythonRelaxDeps = [ "urllib3" ];
+
+  dependencies = [
     requests
     urllib3
   ];
@@ -36,10 +41,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "matrix_client" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python Matrix Client-Server SDK";
     homepage = "https://github.com/matrix-org/matrix-python-sdk";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ olejorgenb ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ olejorgenb ];
   };
 }

From 13384429ea872f579cb514f7cde54b050b4003b2 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 11:45:38 +0900
Subject: [PATCH 2/2] python312Packages.matrix-api-async: remove

matrix-api-async has been removed as it is an old wrapper and no longer
in use
---
 .../matrix-api-async/default.nix              | 30 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 pkgs/development/python-modules/matrix-api-async/default.nix

diff --git a/pkgs/development/python-modules/matrix-api-async/default.nix b/pkgs/development/python-modules/matrix-api-async/default.nix
deleted file mode 100644
index 5bc3704441a3..000000000000
--- a/pkgs/development/python-modules/matrix-api-async/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  matrix-client,
-}:
-
-buildPythonPackage rec {
-  pname = "matrix_api_async";
-  version = "0.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0xdx8fci0lar3x09dwqgka6ssz9d3g7gsfx4yyr13sdwza7zsqc3";
-  };
-
-  propagatedBuildInputs = [ matrix-client ];
-
-  # no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "matrix_api_async" ];
-
-  meta = with lib; {
-    description = "Asyncio wrapper of matrix_client.api";
-    license = licenses.mit;
-    homepage = "https://github.com/Cadair/matrix_api_async";
-    maintainers = with maintainers; [ globin ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..8afb3bb32d6c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -353,6 +353,7 @@ mapAliases ({
   mapbox = throw "mapbox has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
   marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
   markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19
+  matrix-api-async = throw "matrix-api-async has been removed as it is an old wrapper and no longer in use"; # added 2025-01-01
   memory_profiler = memory-profiler; # added 2023-10-09
   mir_eval = mir-eval; # added 2024-01-07
   mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74..30376aaf326d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7945,8 +7945,6 @@ self: super: with self; {
 
   matplotx = callPackage ../development/python-modules/matplotx { };
 
-  matrix-api-async = callPackage ../development/python-modules/matrix-api-async { };
-
   matrix-client = callPackage ../development/python-modules/matrix-client { };
 
   matrix-common = callPackage ../development/python-modules/matrix-common { };