From af0ca98c62dc200ef884c645baa11dfdd4cdcf25 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 2 Jun 2026 03:20:56 -0600
Subject: [PATCH] apache-airflow: 3.2.1 -> 3.2.2

https://github.com/apache/airflow/releases/tag/3.2.2
Diff: https://github.com/apache/airflow/compare/3.2.1...3.2.2
(cherry picked from commit 07da0308d486a6a5ef0f05117fee74bf6d6d6e42)
---
 pkgs/by-name/ap/apache-airflow/providers.nix  |  7 +++++-
 .../ap/apache-airflow/python-package.nix      | 22 ++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ap/apache-airflow/providers.nix b/pkgs/by-name/ap/apache-airflow/providers.nix
index daeb8ea84589..db03b3269823 100644
--- a/pkgs/by-name/ap/apache-airflow/providers.nix
+++ b/pkgs/by-name/ap/apache-airflow/providers.nix
@@ -473,6 +473,7 @@
       "kerberos"
       "marshmallow"
       "msgpack"
+      "pyjwt"
       "werkzeug"
       "wtforms"
     ];
@@ -644,7 +645,10 @@
   };
 
   jdbc = {
-    deps = [ "jaydebeapi" ];
+    deps = [
+      "jaydebeapi"
+      "jpype1"
+    ];
     imports = [
       "airflow.providers.jdbc"
       "airflow.providers.jdbc.get_provider_info"
@@ -754,6 +758,7 @@
     deps = [
       "aiomysql"
       "mysqlclient"
+      "pymysql"
     ];
     imports = [
       "airflow.providers.mysql"
diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
index 1d6bee59763a..d77fa769c3c8 100644
--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@@ -19,6 +19,7 @@
   attrs,
   babel,
   buildPythonPackage,
+  cachetools,
   cadwyn,
   colorlog,
   cron-descriptor,
@@ -88,13 +89,13 @@
   enabledProviders,
 }:
 let
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "airflow";
     tag = version;
-    hash = "sha256-jwWxH9fTTCFdLAaAN18/FUAbN0cTCPkkk9+0ZMYNXek=";
+    hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU=";
   };
 
   pnpm = pnpm_10;
@@ -119,7 +120,7 @@ let
         pnpm
         ;
       fetcherVersion = 3;
-      hash = "sha256-OkSDQoWsHQ6w1vIoX5W9zXHghV0obvL6Wji0HYN6CSs=";
+      hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ=";
     };
 
     buildPhase = ''
@@ -146,9 +147,14 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       pname = "simple-auth-manager-ui";
-      inherit sourceRoot src version;
+      inherit
+        sourceRoot
+        src
+        version
+        pnpm
+        ;
       fetcherVersion = 3;
-      hash = "sha256-uQIVHzX0BcJuxgbPp6wqKhALbsfACSJjiMOdmrpuzOk=";
+      hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0=";
     };
 
     buildPhase = ''
@@ -212,6 +218,7 @@ let
       sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml
       sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
       sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml
+      sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
 
       # Copy built UI assets
       cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/
@@ -235,6 +242,7 @@ let
       argcomplete
       asgiref
       attrs
+      cachetools
       cadwyn
       colorlog
       cron-descriptor
@@ -291,6 +299,8 @@ let
       uvicorn
     ]
     ++ (map buildProvider requiredProviders);
+
+    pythonRelaxDeps = [ "starlette" ];
   };
 
   taskSdk = buildPythonPackage {
@@ -308,6 +318,7 @@ let
       sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
       sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
       sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+      sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
 
       # task-sdk needs config.yml from core subpackage
       mkdir -p src/airflow/config_templates
@@ -354,6 +365,7 @@ buildPythonPackage rec {
     sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
     sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
     sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+    sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
   '';
 
   nativeBuildInputs = [ writableTmpDirAsHomeHook ];