pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #24352 from cko/spark-1_6_3

spark: 1.6.0 ->1.6.3

authored by Tim Steinbach and committed by GitHub b90b1828 ecca1528

+3 -3
unified split
+2 -2
pkgs/applications/networking/cluster/spark/default.nix
··· 6 7 let 8 versionMap = { 9 - "1.6.0" = { 10 hadoopVersion = "cdh4"; 11 - sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c"; 12 }; 13 "2.1.0" = { 14 hadoopVersion = "hadoop2.4";
··· 6 7 let 8 versionMap = { 9 + "1.6.3" = { 10 hadoopVersion = "cdh4"; 11 + sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn"; 12 }; 13 "2.1.0" = { 14 hadoopVersion = "hadoop2.4";
+1 -1
pkgs/top-level/all-packages.nix
··· 6093 self = callPackage_i686 ../development/interpreters/self { }; 6094 6095 spark = spark_21; 6096 - spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; }; 6097 spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; }; 6098 6099 spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
··· 6093 self = callPackage_i686 ../development/interpreters/self { }; 6094 6095 spark = spark_21; 6096 + spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; }; 6097 spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; }; 6098 6099 spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };