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;