From af2d542fb5c985ede70bf4165bad92b49d26856f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Mon, 21 Jun 2021 20:24:44 +0200
Subject: [PATCH] Revert "use sqlalchemy 1.3.x for mautrix-telegram"

---
 .../python-modules/sqlalchemy/1.3.nix         | 45 -------------------
 .../sqlalchemy/{1.4.nix => default.nix}       |  0
 pkgs/servers/mautrix-telegram/default.nix     | 10 ++---
 pkgs/top-level/python-packages.nix            |  4 +-
 4 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/development/python-modules/sqlalchemy/1.3.nix
 rename pkgs/development/python-modules/sqlalchemy/{1.4.nix => default.nix} (100%)

diff --git a/pkgs/development/python-modules/sqlalchemy/1.3.nix b/pkgs/development/python-modules/sqlalchemy/1.3.nix
deleted file mode 100644
index f0c9ce2bf736..000000000000
--- a/pkgs/development/python-modules/sqlalchemy/1.3.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch
-, mock
-, pysqlite ? null
-, pytestCheckHook
-, pytest_xdist
-}:
-
-buildPythonPackage rec {
-  pname = "SQLAlchemy";
-  version = "1.3.23";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b";
-  };
-
-  patches = [
-    # fix test_pyodbc_extra_connect_azure test failure
-    (fetchpatch {
-      url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch";
-      sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db";
-    })
-  ];
-
-  checkInputs = [
-    pytestCheckHook
-    mock
-  ] ++ lib.optional (!isPy3k) pysqlite;
-
-  postInstall = ''
-    sed -e 's:--max-worker-restart=5::g' -i setup.cfg
-  '';
-
-  dontUseSetuptoolsCheck = true;
-
-  # disable mem-usage tests on mac, has trouble serializing pickle files
-  disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]
-    ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ];
-
-  meta = with lib; {
-    homepage = "http://www.sqlalchemy.org/";
-    description = "A Python SQL toolkit and Object Relational Mapper";
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/python-modules/sqlalchemy/1.4.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
similarity index 100%
rename from pkgs/development/python-modules/sqlalchemy/1.4.nix
rename to pkgs/development/python-modules/sqlalchemy/default.nix
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index cc816ee793ea..bf00462875b2 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -29,17 +29,13 @@ in buildPythonPackage rec {
   propagatedBuildInputs = [
     Mako
     aiohttp
-    (mautrix.override {
-      sqlalchemy = sqlalchemy_1_3;
-    })
-    sqlalchemy_1_3
+    mautrix
+    sqlalchemy
     CommonMark
     ruamel_yaml
     python_magic
     telethon
-    (telethon-session-sqlalchemy.override {
-      sqlalchemy = sqlalchemy_1_3;
-    })
+    telethon-session-sqlalchemy
     pillow
     lxml
     setuptools
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 024642ef4f24..c192dd109791 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8157,9 +8157,7 @@ in {
 
   spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { };
 
-  sqlalchemy_1_3 = callPackage ../development/python-modules/sqlalchemy/1.3.nix { };
-  sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1.4.nix { };
-  sqlalchemy = self.sqlalchemy_1_4;
+  sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
 
   sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };