summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2017-03-30 22:36:16 -0400
committerGitHub <noreply@github.com>2017-03-30 22:36:16 -0400
commitb90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c (patch)
treea6fe34f3eb2aa7c398c69cc9dfbc0c0632adf457 /pkgs
parentecca15288706bfa40d02c4e6ec5f990eca87a3ef (diff)
parent9d18de5f88b1da69ad6bbfcd7a607b95d431ecc2 (diff)
downloadnixpkgs-b90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c.tar
nixpkgs-b90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c.tar.gz
nixpkgs-b90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c.tar.bz2
nixpkgs-b90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c.tar.lz
nixpkgs-b90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c.tar.xz
nixpkgs-b90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c.tar.zst
nixpkgs-b90b1828ddf87306ac5b1ace8702d7e5c5a6cd1c.zip
Merge pull request #24352 from cko/spark-1_6_3
spark: 1.6.0 ->1.6.3
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/cluster/spark/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 7ba8a2ea1cd..837447fe60f 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -6,9 +6,9 @@
 
 let
   versionMap = {
-    "1.6.0" = {
+    "1.6.3" = {
                 hadoopVersion = "cdh4";
-                sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c";
+                sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn";
               };
     "2.1.0" = {
                 hadoopVersion = "hadoop2.4";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14d49ab16b2..e0ef39ce64f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6093,7 +6093,7 @@ with pkgs;
   self = callPackage_i686 ../development/interpreters/self { };
 
   spark = spark_21;
-  spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; };
+  spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; };
   spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; };
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };