From 672e1f3124728cf592d564bb1dd8b564d115c02f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 6 Sep 2025 19:44:22 +0200
Subject: [PATCH 1/3] python313Packages.pyspnego: 0.11.2 -> 0.12.0

Diff: https://github.com/jborean93/pyspnego/compare/v0.11.2...v0.12.0

Changelog: https://github.com/jborean93/pyspnego/blob/v0.12.0/CHANGELOG.md
---
 pkgs/development/python-modules/pyspnego/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index a0a32a77c0b6..fc879a48cbcc 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyspnego";
-  version = "0.11.2";
+  version = "0.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "jborean93";
     repo = "pyspnego";
     tag = "v${version}";
-    hash = "sha256-5aGHCw0d1aFcHLPRMkya0hlHV30aTKshbcOjfPMOFko=";
+    hash = "sha256-dkss+8Z0dS4MTunBZWEH+WK1+kGikCHf7VPCR1reMS0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From de4d3205ee7069804d02ebd83b955e6815a89979 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Sep 2025 01:52:01 +0200
Subject: [PATCH 2/3] python313Packages.trino-python-client: disable failing
 tests

---
 .../trino-python-client/default.nix           | 49 ++++++++++++-------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix
index bbf712cdf37e..16756d0b36b3 100644
--- a/pkgs/development/python-modules/trino-python-client/default.nix
+++ b/pkgs/development/python-modules/trino-python-client/default.nix
@@ -1,26 +1,28 @@
 {
   lib,
   buildPythonPackage,
+  boto3,
   fetchFromGitHub,
-  # build
-  setuptools,
-  # required
-  pytz,
-  requests,
-  tzlocal,
-  # optional
-  requests-kerberos,
-  sqlalchemy,
-  keyring,
-  # tests
-  pytestCheckHook,
   httpretty,
+  keyring,
+  lz4,
+  pytestCheckHook,
+  python-dateutil,
+  pytz,
+  requests-gssapi,
+  requests-kerberos,
+  requests,
+  setuptools,
+  sqlalchemy,
+  testcontainers,
+  tzlocal,
+  zstandard,
 }:
 
 buildPythonPackage rec {
   pname = "trino-python-client";
   version = "0.334.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     repo = "trino-python-client";
@@ -29,31 +31,37 @@ buildPythonPackage rec {
     hash = "sha256-cSwMmzIUFYX8VgSwobth8EsARUff3hhfBf+IrhuFSYM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
+    lz4
+    python-dateutil
     pytz
     requests
     tzlocal
+    zstandard
   ];
 
   optional-dependencies = lib.fix (self: {
     kerberos = [ requests-kerberos ];
+    gsaapi = [ requests-gssapi ];
     sqlalchemy = [ sqlalchemy ];
     external-authentication-token-cache = [ keyring ];
     all = self.kerberos ++ self.sqlalchemy;
   });
 
   nativeCheckInputs = [
+    boto3
     httpretty
     pytestCheckHook
+    testcontainers
   ]
-  ++ optional-dependencies.all;
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "trino" ];
 
   disabledTestPaths = [
-    # these all require a running trino instance
+    # Tests require a running trino instance
     "tests/integration/test_types_integration.py"
     "tests/integration/test_dbapi_integration.py"
     "tests/integration/test_sqlalchemy_integration.py"
@@ -61,6 +69,13 @@ buildPythonPackage rec {
 
   disabledTestMarks = [ "auth" ];
 
+  disabledTests = [
+    # Tests require a running trino instance
+    "test_oauth2"
+    "test_token_retrieved_once_when_authentication_instance_is_shared"
+    "test_multithreaded_oauth2_authentication_flow"
+  ];
+
   meta = with lib; {
     changelog = "https://github.com/trinodb/trino-python-client/blob/${src.tag}/CHANGES.md";
     description = "Client for the Trino distributed SQL Engine";

From 5cdad140ef3d489b07fc399a034edb17d48d600f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Sep 2025 01:53:25 +0200
Subject: [PATCH 3/3] python313Packages.aws-adfs: relax lxml and fido2

---
 pkgs/development/python-modules/aws-adfs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index 810714b0eba1..baf4491c78b2 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -37,6 +37,8 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     "configparser"
+    "fido2"
+    "lxml"
     "requests-kerberos"
   ];