diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 3312f957023a..1b4c65c0b245 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,20 +71,9 @@ let }; in { - spark_3_2 = spark rec { + spark_3_4 = 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" ]; + version = "3.4.0"; + sha256 = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk="; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 393baa3dd9e5..c22d2e9f65cd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1516,6 +1516,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 87fdfc79c227..b5ac28e8f053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17191,11 +17191,8 @@ with pkgs; smiley-sans = callPackage ../data/fonts/smiley-sans { }; inherit (callPackages ../applications/networking/cluster/spark { }) - spark_3_2 - spark_3_1 - spark_2_4; - spark3 = spark_3_2; - spark2 = spark_2_4; + spark_3_4; + spark3 = spark_3_4; spark = spark3; sparkleshare = callPackage ../applications/version-management/sparkleshare { };