From cea7de1d0fb130e2ca307491ab8a9d0a922e80c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 28 Jan 2024 22:19:24 +0100 Subject: [PATCH 1/2] python311Packages.sqlalchemy: 2.0.21 -> 2.0.25 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_22 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_23 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_24 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_25 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9ea29db26c8d..edee5d1d4414 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.21"; + version = "2.0.25"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ldBn+pdZfqnBKdYkOcG47ScH/hBgeJBeIvn1hCIBw/A="; + hash = "sha256-nfkYzLpWyNXDuRUJl5pzaedw5v7jHpG7kpmr6VTGUaw="; }; postPatch = '' From 45ec7e6f80b0e3417cab470219e7babe3f389897 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 28 Jan 2024 22:20:28 +0100 Subject: [PATCH 2/2] python311Packages.sqlalchemy-utils: fix sqlalchemy 2.0.22+ compat --- .../python-modules/sqlalchemy-utils/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 84b42ad27f2f..9fd3c75adcc6 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder # runtime @@ -48,6 +49,12 @@ buildPythonPackage rec { patches = [ ./skip-database-tests.patch + + (fetchpatch { + # sqlalchemy 2.0.22+ compat; https://github.com/kvesteri/sqlalchemy-utils/pull/725 + url = "https://github.com/kvesteri/sqlalchemy-utils/commit/712aabaefc5c8ca3680751c705cf5a5984c74af1.patch"; + hash = "sha256-xBdiUtFWjlUhBzHgGFbaKBt3at6NDo+mv9sd8WwiPOA="; + }) ]; propagatedBuildInputs = [