1 files changed, 56 insertions, 69 deletions
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index 1ace2eab95900..e4865cd091af8 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -1,67 +1,55 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, fetchpatch
-, pythonOlder
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
 
-# runtime
-, importlib-metadata
-, sqlalchemy
+  # runtime
+  importlib-metadata,
+  sqlalchemy,
 
-# optionals
-, babel
-, arrow
-, pendulum
-#, intervals
-, phonenumbers
-, passlib
-, colour
-, python-dateutil
-, furl
-, cryptography
+  # optionals
+  babel,
+  arrow,
+  pendulum,
+  #, intervals
+  phonenumbers,
+  passlib,
+  colour,
+  python-dateutil,
+  furl,
+  cryptography,
 
-# tests
-, pytestCheckHook
-, pygments
-, jinja2
-, docutils
-, flexmock
-, psycopg2
-, psycopg2cffi
-, pg8000
-, pytz
-, backports-zoneinfo
-, pymysql
-, pyodbc
+  # tests
+  pytestCheckHook,
+  pygments,
+  jinja2,
+  docutils,
+  flexmock,
+  psycopg2,
+  psycopg2cffi,
+  pg8000,
+  pytz,
+  backports-zoneinfo,
+  pymysql,
+  pyodbc,
 
 }:
 
 buildPythonPackage rec {
   pname = "sqlalchemy-utils";
-  version = "0.41.1";
+  version = "0.41.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "SQLAlchemy-Utils";
-    hash = "sha256-ohgb/wHuuER544Vx0sBxjrUgQvmv2MGU0NAod+hLfXQ=";
+    hash = "sha256-vFmcjDszGeU85sXDxHESC9Ml0AcftvOKEOkk49B7mZA=";
   };
 
-  patches = [
-    ./skip-database-tests.patch
+  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 = [
-    sqlalchemy
-  ] ++ lib.optionals (pythonOlder "3.8") [
-    importlib-metadata
-  ];
+  propagatedBuildInputs = [ sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   passthru.optional-dependencies = {
     babel = [ babel ];
@@ -76,27 +64,26 @@ buildPythonPackage rec {
     encrypted = [ cryptography ];
   };
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    pygments
-    jinja2
-    docutils
-    flexmock
-    psycopg2
-    pg8000
-    pytz
-    python-dateutil
-    pymysql
-    pyodbc
-  ]
-  ++ lib.flatten (builtins.attrValues passthru.optional-dependencies)
-  ++ lib.optionals (pythonOlder "3.12") [
-    # requires distutils, which were removed in 3.12
-    psycopg2cffi
-  ]
-  ++ lib.optionals (pythonOlder "3.9") [
-    backports-zoneinfo
-  ];
+  nativeCheckInputs =
+    [
+      pytestCheckHook
+      pygments
+      jinja2
+      docutils
+      flexmock
+      psycopg2
+      pg8000
+      pytz
+      python-dateutil
+      pymysql
+      pyodbc
+    ]
+    ++ lib.flatten (builtins.attrValues passthru.optional-dependencies)
+    ++ lib.optionals (pythonOlder "3.12") [
+      # requires distutils, which were removed in 3.12
+      psycopg2cffi
+    ]
+    ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
 
   pytestFlagsArray = [
     "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice"