From 9b758c5010541ab40d2dec99fd9382a491f7e526 Mon Sep 17 00:00:00 2001
From: Sergei Volkov <taranarmo@gmail.com>
Date: Thu, 17 Sep 2026 17:16:43 +0200
Subject: [PATCH] apache-airflow: 3.3.1 -> 3.3.2

(cherry picked from commit 7fab5b517750878ca9408cba2d31ce2ea60c7309)
---
 .../ap/apache-airflow/python-package.nix      | 65 +++++++++++++++----
 1 file changed, 52 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
index 262ad2b9789d..1fbe68eafbcf 100644
--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@@ -80,6 +80,7 @@
   tenacity,
   termcolor,
   tomli,
+  tomlkit,
   trove-classifiers,
   types-requests,
   typing-extensions,
@@ -115,7 +116,7 @@ buildPythonPackage (
         pnpm = pnpm_10;
         sourceRoot = uiAttrs.sourceRoot;
         fetcherVersion = 3;
-        hash = "sha256-dn8DRI2uRlc5FKNiP2nL1RlZOs7NSH+66qHyUKP5KBc=";
+        hash = "sha256-+f/AcJSQyvu3YCT6p4wvbNXz/xM0WN8N+MWT7iLlFEk=";
       };
 
       buildPhase = ''
@@ -148,7 +149,7 @@ buildPythonPackage (
         pnpm = pnpm_10;
         sourceRoot = simpleUiAttrs.sourceRoot;
         fetcherVersion = 3;
-        hash = "sha256-KcWxcWPhtoZIfa1DZdIjTDik28cTk86HQnCBg8e2xWg=";
+        hash = "sha256-jLCTKdBdKQufVWQ1XRzOVN4jVC0YAcP+jnz5R966zUY=";
       };
 
       buildPhase = ''
@@ -181,20 +182,37 @@ buildPythonPackage (
 
         dontCheckPythonMetadata = true;
 
+        dontCheckRuntimeDeps = true;
+
         inherit src;
         sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}";
 
-        buildInputs = [ flit-core ];
+        postPatch = ''
+          # relax dependencies
+          sed -i -E 's/"flit_core==[^"]+"/"flit_core"/' pyproject.toml
+          sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
+          sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
+          sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
+          sed -i -E 's/"pluggy==[^"]+"/"pluggy"/' pyproject.toml
+          sed -i -E 's/"tomlkit==[^"]+"/"tomlkit"/' pyproject.toml
+          sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+        '';
+
+        build-system = [
+          flit-core
+          hatchling
+          packaging
+          pathspec
+          pluggy
+          tomlkit
+          trove-classifiers
+        ];
 
         dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps;
 
         pythonRemoveDeps = [
           "apache-airflow"
         ];
-
-        pythonRelaxDeps = [
-          "flit-core"
-        ];
       };
 
     taskSdk = buildPythonPackage {
@@ -213,8 +231,10 @@ buildPythonPackage (
         # relax dependencies
         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
+        sed -i -E 's/"pluggy==[^"]+"/"pluggy"/' pyproject.toml
+        sed -i -E 's/"tomlkit==[^"]+"/"tomlkit"/' pyproject.toml
+        sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
 
         # task-sdk needs config.yml from core subpackage
         mkdir -p src/airflow/config_templates
@@ -223,6 +243,11 @@ buildPythonPackage (
 
       build-system = [
         hatchling
+        packaging
+        pathspec
+        pluggy
+        tomlkit
+        trove-classifiers
       ];
 
       dependencies = [
@@ -239,7 +264,10 @@ buildPythonPackage (
         methodtools
         msgspec
         opentelemetry-api
+        packaging
+        pathspec
         pendulum
+        pluggy
         psutil
         pydantic
         pygtrie
@@ -249,6 +277,7 @@ buildPythonPackage (
         structlog
         tenacity
         types-requests
+        typing-extensions
       ];
     };
 
@@ -269,9 +298,13 @@ buildPythonPackage (
         sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
         sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
         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
+        sed -i -E 's/"pluggy==[^"]+"/"pluggy"/' pyproject.toml
+        sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml
+        sed -i -E 's/"tomlkit==[^"]+"/"tomlkit"/' pyproject.toml
+        sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+
+        # fixes for release26.05 branch
         sed -i -E 's/"croniter>=[^"]+"/"croniter"/' pyproject.toml
         sed -i -E 's/"sqlalchemy\[asyncio\]>=[^"]+"/"sqlalchemy[asyncio]"/' pyproject.toml
 
@@ -285,8 +318,11 @@ buildPythonPackage (
         gitpython
         hatchling
         packaging
+        pathspec
+        pluggy
         smmap
         tomli
+        tomlkit
         trove-classifiers
       ];
 
@@ -363,7 +399,7 @@ buildPythonPackage (
   in
   {
     pname = "apache-airflow";
-    version = "3.3.1";
+    version = "3.3.2";
 
     strictDeps = true;
     __structuredAttrs = true;
@@ -372,7 +408,7 @@ buildPythonPackage (
       owner = "apache";
       repo = "airflow";
       tag = finalAttrs.version;
-      hash = "sha256-ezEeO14GdaD7ZAl5VCiiIqkyoccHQ76QrThA3NeGP78=";
+      hash = "sha256-iWr1LYq+lThZU7b7CmrIWFbg20bFy+SghrBpE6asgrg=";
     };
 
     pyproject = true;
@@ -381,8 +417,10 @@ buildPythonPackage (
       # relax dependencies
       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
+      sed -i -E 's/"pluggy==[^"]+"/"pluggy"/' pyproject.toml
+      sed -i -E 's/"tomlkit==[^"]+"/"tomlkit"/' pyproject.toml
+      sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
     '';
 
     nativeBuildInputs = [ writableTmpDirAsHomeHook ];
@@ -396,6 +434,7 @@ buildPythonPackage (
       pluggy
       smmap
       tomli
+      tomlkit
       trove-classifiers
     ];