Merge pull request #33739 from andir/spark

Apache Spark address CVE-2017-12612
This commit is contained in:
Andreas Rammhold 2018-01-11 18:13:48 +00:00 committed by GitHub
commit 856d9c2b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions

View File

@ -6,13 +6,9 @@
let
versionMap = {
"1.6.3" = {
hadoopVersion = "cdh4";
sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn";
};
"2.2.0" = {
"2.2.1" = {
hadoopVersion = "hadoop2.7";
sparkSha256 = "0wjjn2pgalrcji8avhj5d48kl1mf7rhrdxhzf29dbiszq4fkx0s6";
sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c";
};
};
in

View File

@ -6966,8 +6966,7 @@ with pkgs;
self = callPackage_i686 ../development/interpreters/self { };
spark = spark_22;
spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; };
spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.0"; };
spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; };
spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };