summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-01-11 12:52:32 +0100
committerAndreas Rammhold <andreas@rammhold.de>2018-01-11 12:52:32 +0100
commit3e2015c239bba4732a576cc89a538173a944ef36 (patch)
tree42a13fe5b11492311cc1b748774fc29653515752 /pkgs
parente250ca072ab8afd449aa8296378a30039c1893ff (diff)
downloadnixlib-3e2015c239bba4732a576cc89a538173a944ef36.tar
nixlib-3e2015c239bba4732a576cc89a538173a944ef36.tar.gz
nixlib-3e2015c239bba4732a576cc89a538173a944ef36.tar.bz2
nixlib-3e2015c239bba4732a576cc89a538173a944ef36.tar.lz
nixlib-3e2015c239bba4732a576cc89a538173a944ef36.tar.xz
nixlib-3e2015c239bba4732a576cc89a538173a944ef36.tar.zst
nixlib-3e2015c239bba4732a576cc89a538173a944ef36.zip
spark_22: 2.2.0 -> 2.2.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/cluster/spark/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index ac3399445b40..99b7566fc713 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -6,9 +6,9 @@
 
 let
   versionMap = {
-    "2.2.0" = {
+    "2.2.1" = {
                 hadoopVersion = "hadoop2.7";
-                sparkSha256 = "0wjjn2pgalrcji8avhj5d48kl1mf7rhrdxhzf29dbiszq4fkx0s6";
+                sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c";
               };
   };
 in
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
     license          = stdenv.lib.licenses.asl20;
     platforms        = stdenv.lib.platforms.all;
     maintainers      = with maintainers; [ thoughtpolice offline ];
-    knownVulnerabilities = optional (!((versionAtLeast version "2.2.0") || (versionOlder version "2.2.0" && versionAtLeast version "2.1.2"))) "CVE-2017-12612";
     repositories.git = git://git.apache.org/spark.git;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30ebbe03a10e..bc1708f9c91d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6964,7 +6964,7 @@ with pkgs;
   self = callPackage_i686 ../development/interpreters/self { };
 
   spark = spark_22;
-  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 { };