From 246794d5c48de67ede26c3ca9bc122a56f097877 Mon Sep 17 00:00:00 2001
From: Connor Baker <connorbaker01@gmail.com>
Date: Wed, 9 Mar 2022 23:35:54 -0500
Subject: [PATCH] spark: bring version naming in line with hadoop

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

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 3429a1d703a5..7770f98afe51 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -68,17 +68,17 @@ let
     };
 in
 {
-  spark3_2_1 = spark rec {
+  spark_3_2 = spark rec {
     pname = "spark";
     version = "3.2.1";
     sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d";
   };
-  spark3_1_2 = spark rec {
+  spark_3_1 = spark rec {
     pname = "spark";
     version = "3.1.2";
     sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";
   };
-  spark2 = spark rec {
+  spark_2_4 = spark rec {
     pname = "spark";
     version = "2.4.8";
     sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76fd1ba96756..c2c324307f88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14095,10 +14095,11 @@ with pkgs;
   self = pkgsi686Linux.callPackage ../development/interpreters/self { };
 
   inherit (callPackages ../applications/networking/cluster/spark { })
-    spark3_2_1
-    spark3_1_2
-    spark2;
-  spark3 = spark3_1_2;
+    spark_3_2
+    spark_3_1
+    spark_2_4;
+  spark3 = spark_3_2;
+  spark2 = spark_2_4;
   spark = spark3;
 
   sparkleshare = callPackage ../applications/version-management/sparkleshare { };