From a740532ae5501f06f7fdd7fdf2688414f65ffec0 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 8 May 2023 15:46:58 +0100
Subject: [PATCH 1/2] spark: 3.2.2 -> 3.4.0

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

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 3312f957023a..7c51716f44b1 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -31,7 +31,8 @@ let
         mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
         mv * $out/lib/${untarDir}
 
-        cp $out/lib/${untarDir}/conf/log4j.properties{.template,}
+        cp $out/lib/${untarDir}/conf/log4j.properties{.template,} || \
+          cp $out/lib/${untarDir}/conf/log4j2.properties{.template,}
 
         cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF
         export JAVA_HOME="${jdk}"
@@ -70,6 +71,11 @@ let
     };
 in
 {
+  spark_3_4 = spark rec {
+    pname = "spark";
+    version = "3.4.0";
+    sha256 = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk=";
+  };
   spark_3_2 = spark rec {
     pname = "spark";
     version = "3.2.2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f1eab70884f..90d66957aee9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17172,10 +17172,11 @@ with pkgs;
   smiley-sans = callPackage ../data/fonts/smiley-sans { };
 
   inherit (callPackages ../applications/networking/cluster/spark { })
+    spark_3_4
     spark_3_2
     spark_3_1
     spark_2_4;
-  spark3 = spark_3_2;
+  spark3 = spark_3_4;
   spark2 = spark_2_4;
   spark = spark3;
 

From 4a348ef47ea60856351c70c349a964a58d3ac644 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 8 May 2023 17:49:15 +0100
Subject: [PATCH 2/2] spark_2_4, spark_3_1, spark_3_2, spark2: remove

---
 .../networking/cluster/spark/default.nix         | 16 ----------------
 pkgs/top-level/aliases.nix                       |  4 ++++
 pkgs/top-level/all-packages.nix                  |  6 +-----
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 7c51716f44b1..1b4c65c0b245 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -76,20 +76,4 @@ in
     version = "3.4.0";
     sha256 = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk=";
   };
-  spark_3_2 = spark rec {
-    pname = "spark";
-    version = "3.2.2";
-    sha256 = "sha256-yKoTyD/IqvsJQs0jB67h1zqwYaLuikdoa5fYIXtvhz0=";
-  };
-  spark_3_1 = spark rec {
-    pname = "spark";
-    version = "3.1.3";
-    sha256 = "sha256-RIQyN5YjxFLfNIrETR3Vv99zsHxt77rhOXHIThCI2Y8=";
-  };
-  spark_2_4 = spark rec {
-    pname = "spark";
-    version = "2.4.8";
-    sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
-    extraMeta.knownVulnerabilities = [ "CVE-2021-38296" ];
-  };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e0f4e7ae2455..7c72824ee4b9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1514,6 +1514,10 @@ mapAliases ({
   soldat-unstable = opensoldat; # Added 2022-07-02
   solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
   solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
+  spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
+  spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
+  spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
+  spark_3_2 = throw "'spark_3_2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
 
   # Added 2020-02-10
   sourceHanSansPackages = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90d66957aee9..5c39c9a9b424 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17172,12 +17172,8 @@ with pkgs;
   smiley-sans = callPackage ../data/fonts/smiley-sans { };
 
   inherit (callPackages ../applications/networking/cluster/spark { })
-    spark_3_4
-    spark_3_2
-    spark_3_1
-    spark_2_4;
+    spark_3_4;
   spark3 = spark_3_4;
-  spark2 = spark_2_4;
   spark = spark3;
 
   sparkleshare = callPackage ../applications/version-management/sparkleshare { };