Merge pull request #298458 from LeSuisse/spark_3_3

spark_3_3: drop
This commit is contained in:
Pol Dellaiera 2024-03-24 22:44:38 +01:00 committed by GitHub
commit 8245797f55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 8 deletions

View File

@ -4,7 +4,6 @@
, makeWrapper , makeWrapper
, jdk8 , jdk8
, python3 , python3
, python310
, coreutils , coreutils
, hadoop , hadoop
, RSupport ? true , RSupport ? true
@ -73,10 +72,4 @@ in
version = "3.4.2"; version = "3.4.2";
hash = "sha256-qr0tRuzzEcarJznrQYkaQzGqI7tugp/XJpoZxL7tJwk="; hash = "sha256-qr0tRuzzEcarJznrQYkaQzGqI7tugp/XJpoZxL7tJwk=";
}; };
spark_3_3 = spark rec {
pname = "spark";
version = "3.3.3";
hash = "sha256-YtHxRYTwrwSle3UpFjRSwKcnLFj2m9/zLBENH/HVzuM=";
pysparkPython = python310;
};
} }

View File

@ -1135,6 +1135,7 @@ mapAliases ({
spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 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_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_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
spark_3_3 = throw "'spark_3_3' is no longer supported nixpkgs, please use 'spark'"; # Added 2024-03-23
spark2014 = gnatprove; # Added 2024-02-25 spark2014 = gnatprove; # Added 2024-02-25
# Added 2020-02-10 # Added 2020-02-10

View File

@ -17816,7 +17816,7 @@ with pkgs;
smiley-sans = callPackage ../data/fonts/smiley-sans { }; smiley-sans = callPackage ../data/fonts/smiley-sans { };
inherit (callPackages ../applications/networking/cluster/spark { }) inherit (callPackages ../applications/networking/cluster/spark { })
spark_3_5 spark_3_4 spark_3_3; spark_3_5 spark_3_4;
spark3 = spark_3_5; spark3 = spark_3_5;
spark = spark3; spark = spark3;