From 5874ae321174463312d8fcf43ae221cdb6ff1b05 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 17:45:37 -0500
Subject: [PATCH 1/2] spark_4_0: init at 4.0.1

---
 .../networking/cluster/spark/default.nix      | 19 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 2609c4fd0a2b..606f79ad3706 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -8,6 +8,8 @@
   RSupport ? true,
   R,
   nixosTests,
+  # needeed in situations where hadoop's jdk version is too old
+  jdk21_headless,
 }:
 
 let
@@ -28,7 +30,15 @@ let
         R
         pysparkPython
         ;
-      inherit (finalAttrs.hadoop) jdk;
+      jdk =
+        if
+          (
+            (lib.versionAtLeast finalAttrs.version "4") && (lib.versionOlder finalAttrs.hadoop.jdk.version "21")
+          )
+        then
+          jdk21_headless
+        else
+          finalAttrs.hadoop.jdk;
       src = fetchzip {
         url =
           with finalAttrs;
@@ -96,12 +106,17 @@ in
   # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08).
   # A better policy is to keep these versions around, and clean up EOL versions just before
   # a new NixOS release.
+  spark_4_0 = spark {
+    pname = "spark";
+    version = "4.0.1";
+    hash = "sha256-AW+EQ83b4orJO3+dUPPDlTRAH/D94U7KQBKvKjguChY=";
+  };
   spark_3_5 = spark {
     pname = "spark";
     version = "3.5.5";
     hash = "sha256-vzcWgIfHPhN3nyrxdk3f0p4fW3MpQ+FuEPnWPw0xNPg=";
   };
-  spark_3_4 = spark rec {
+  spark_3_4 = spark {
     pname = "spark";
     version = "3.4.4";
     hash = "sha256-GItHmthLhG7y0XSF3QINCyE7wYFb0+lPZmYLUuMa4Ww=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d73fc31da43e..329bca9896bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6359,11 +6359,13 @@ with pkgs;
   samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
 
   inherit (callPackages ../applications/networking/cluster/spark { })
+    spark_4_0
     spark_3_5
     spark_3_4
     ;
   spark3 = spark_3_5;
   spark = spark3;
+  spark4 = spark_4_0;
 
   inherit
     ({

From 07969eeb4d65629e448854a6f3e02675a23845e1 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 17:45:59 -0500
Subject: [PATCH 2/2] spark: 3.5.5 -> 4.0.1

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 329bca9896bb..3bb9625bf467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6364,8 +6364,8 @@ with pkgs;
     spark_3_4
     ;
   spark3 = spark_3_5;
-  spark = spark3;
   spark4 = spark_4_0;
+  spark = spark_4_0;
 
   inherit
     ({