git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127486 from petabyteboy/feature/fix-mautrix

use sqlalchemy 1.3.x for mautrix-telegram

commitaa5c48152a7792a2b8e122283af11371e5b6e5f2 authorMaximilian Bosch <maximilian@mbosch.me> dateSun 20 Jun 2021, 19:16 (5 years ago) parent88782d18772f33
4 files changed+55−4
pkgs/development/python-modules/sqlalchemy/1.3.nix+45 pkgs/development/python-modules/sqlalchemy/default.nix → pkgs/development/python-modules/sqlalchemy/1.4.nix pkgs/servers/mautrix-telegram/default.nix+7−3 pkgs/top-level/python-packages.nix+3−1
pkgs/development/python-modules/sqlalchemy/1.3.nixnew file+45
@@ -0,0 +1,45 @@
1+{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch
2+, mock
3+, pysqlite ? null
4+, pytestCheckHook
5+, pytest_xdist
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "SQLAlchemy";
10+ version = "1.3.23";
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b";
15+ };
16+
17+ patches = [
18+ # fix test_pyodbc_extra_connect_azure test failure
19+ (fetchpatch {
20+ url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch";
21+ sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db";
22+ })
23+ ];
24+
25+ checkInputs = [
26+ pytestCheckHook
27+ mock
28+ ] ++ lib.optional (!isPy3k) pysqlite;
29+
30+ postInstall = ''
31+ sed -e 's:--max-worker-restart=5::g' -i setup.cfg
32+ '';
33+
34+ dontUseSetuptoolsCheck = true;
35+
36+ # disable mem-usage tests on mac, has trouble serializing pickle files
37+ disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]
38+ ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ];
39+
40+ meta = with lib; {
41+ homepage = "http://www.sqlalchemy.org/";
42+ description = "A Python SQL toolkit and Object Relational Mapper";
43+ license = licenses.mit;
44+ };
45+}
pkgs/development/python-modules/sqlalchemy/default.nix → pkgs/development/python-modules/sqlalchemy/1.4.nixrenamed

The content is the same.

pkgs/servers/mautrix-telegram/default.nix+7−3
@@ -29,13 +29,17 @@ in buildPythonPackage rec {
2929 propagatedBuildInputs = [
3030 Mako
3131 aiohttp
32− mautrix
33− sqlalchemy
32+ (mautrix.override {
33+ sqlalchemy = sqlalchemy_1_3;
34+ })
35+ sqlalchemy_1_3
3436 CommonMark
3537 ruamel_yaml
3638 python_magic
3739 telethon
38− telethon-session-sqlalchemy
40+ (telethon-session-sqlalchemy.override {
41+ sqlalchemy = sqlalchemy_1_3;
42+ })
3943 pillow
4044 lxml
4145 setuptools
pkgs/top-level/python-packages.nix+3−1
@@ -8135,7 +8135,9 @@ in {
81358135
81368136 spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { };
81378137
8138− sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
8138+ sqlalchemy_1_3 = callPackage ../development/python-modules/sqlalchemy/1.3.nix { };
8139+ sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1.4.nix { };
8140+ sqlalchemy = self.sqlalchemy_1_4;
81398141
81408142 sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };
81418143