diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
| commit | 333f145d7604f07e3b2164b459b46e075fea81f4 (patch) | |
| tree | cb9bb91bafeafe64c97fa1054223c0d69cf18848 /pkgs/applications/networking/cluster | |
| parent | d253b3d875d2bae84afbc141754b286e18e2fb7d (diff) | |
| parent | 7e3c95a0b813394b1a41b73e078d3ffd9e951979 (diff) | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications/networking/cluster')
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock index e1dfc0d4a3db9..b273595bbb051 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock +++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock @@ -86,7 +86,7 @@ GEM railties (>= 3.2.16) json (1.8.2) kramdown (1.4.0) - libv8 (3.16.14.7) + libv8 (3.16.14.11) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix index cfb2b6f460f0a..b41b482edb73c 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix @@ -332,11 +332,11 @@ sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80"; }; }; - "libv8" = { - version = "3.16.14.7"; + libv8 = { + version = "3.16.14.11"; source = { type = "gem"; - sha256 = "0dv5q5n5nf6b8h3fybwmsr3vkj70w4g1jpf6661j3hsv9vp0g4qq"; + sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp"; }; }; "mail" = { @@ -786,4 +786,4 @@ "railties" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 1852f21d27ac5..1147c4b64a190 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "spark-${version}"; - version = "1.1.1"; + version = "1.4.0"; src = fetchurl { - url = "http://d3kbcqa49mib13.cloudfront.net/${name}-bin-cdh4.tgz"; - sha256 = "1k0lw8aq5is3gnsrm8q24s0knga6kb3c9xsca20g11fy8b0y4nvk"; + url = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz"; + sha256 = "1w60xzzg9mcymin1pmqwx1mvcqmdpfyxhd2dmw5alhnrzi21ycxi"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] |