diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 1b4c65c0b245..80142048c6fe 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -13,13 +13,13 @@ }: let - spark = { pname, version, sha256, extraMeta ? {} }: + spark = { pname, version, hash, extraMeta ? {} }: stdenv.mkDerivation rec { inherit pname version; jdk = if hadoopSupport then hadoop.jdk else jdk8; src = fetchzip { url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = sha256; + inherit hash; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk python3Packages.python ] @@ -74,6 +74,18 @@ in spark_3_4 = spark rec { pname = "spark"; version = "3.4.0"; - sha256 = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk="; + hash = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk="; + }; + spark_3_3 = spark rec { + pname = "spark"; + version = "3.3.2"; + hash = "sha256-AeKe2QN+mhUJgZRSIgbi/DttAWlDgwC1kl9p7syEvbo="; + extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ]; + }; + spark_3_2 = spark rec { + pname = "spark"; + version = "3.2.4"; + hash = "sha256-xL4W+dTWbvmmncq3/8iXmhp24rp5SftvoRfkTyxCI8E="; + extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9649879e18f8..9114dc2f9300 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1529,7 +1529,6 @@ mapAliases ({ 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 43d761551d20..9cd61ff3fa4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17314,7 +17314,7 @@ with pkgs; smiley-sans = callPackage ../data/fonts/smiley-sans { }; inherit (callPackages ../applications/networking/cluster/spark { }) - spark_3_4; + spark_3_4 spark_3_3 spark_3_2; spark3 = spark_3_4; spark = spark3;