diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-01-11 18:13:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 18:13:48 +0000 |
| commit | 856d9c2b49b983e0735f3ca3a455a9da13ae55d9 (patch) | |
| tree | 9f08dc35f8ebe1ad34c2946e52b3a1369d9958a3 | |
| parent | 9ab77680b6a56304f04d5c5266663d7c622d5491 (diff) | |
| parent | 3e2015c239bba4732a576cc89a538173a944ef36 (diff) | |
| download | nixlib-856d9c2b49b983e0735f3ca3a455a9da13ae55d9.tar nixlib-856d9c2b49b983e0735f3ca3a455a9da13ae55d9.tar.gz nixlib-856d9c2b49b983e0735f3ca3a455a9da13ae55d9.tar.bz2 nixlib-856d9c2b49b983e0735f3ca3a455a9da13ae55d9.tar.lz nixlib-856d9c2b49b983e0735f3ca3a455a9da13ae55d9.tar.xz nixlib-856d9c2b49b983e0735f3ca3a455a9da13ae55d9.tar.zst nixlib-856d9c2b49b983e0735f3ca3a455a9da13ae55d9.zip | |
Merge pull request #33739 from andir/spark
Apache Spark address CVE-2017-12612
| -rw-r--r-- | pkgs/applications/networking/cluster/spark/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 79500a33bf80..99b7566fc713 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ee54227398d..8d20d1bcba8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |