From 296870710107f1ce0c84faa36a8486c88a003417 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Mon, 22 Jun 2015 13:14:19 -0500 Subject: [PATCH] jruby: 1.7.12 -> 1.7.20.1 Security release which only updates Rubygems to version 2.4.8. Rubygems 2.4.8 addresses CVE-2015-1855 to resolve some problems with wildcard matching of hostnames. See following entry for more information: http://jruby.org/2015/06/10/jruby-1-7-20-1.html --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index ab559aa9e659..bc76e334b551 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "1.7.12"; + version = "1.7.20.1"; src = fetchurl { url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha1 = "056cee1138e49da40a77f179b771372692479002"; + sha1 = "6a6e701a3a5769ec5d53a78660521c37da36e41f"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27169e6ee0d4..d0cc669f4253 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5104,7 +5104,7 @@ let jdtsdk = callPackage ../development/eclipse/jdt-sdk { }; - jruby165 = callPackage ../development/interpreters/jruby { }; + jruby = callPackage ../development/interpreters/jruby { }; jython = callPackage ../development/interpreters/jython {};