Merge pull request #2350 from wizeman/u/upd-jruby

jruby: Update from 1.6.5.1 to 1.7.12
This commit is contained in:
Austin Seipp 2014-05-18 08:27:37 -05:00
commit c8dd0f68d7

View file

@ -1,11 +1,13 @@
{ stdenv, fetchurl, makeWrapper, jre }: { stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "jruby-1.6.5.1"; name = "jruby-${version}";
version = "1.7.12";
src = fetchurl { src = fetchurl {
url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz; url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "1j0iv1q950lyir9vqfgg2533f1q28jaz7vnxqswsaix1mjhm29qd"; sha1 = "056cee1138e49da40a77f179b771372692479002";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -14,7 +16,7 @@ stdenv.mkDerivation {
mkdir -pv $out mkdir -pv $out
mv * $out mv * $out
rm $out/bin/*.{bat,dll,exe,sh} rm $out/bin/*.{bat,dll,exe,sh}
mv $out/README $out/docs mv $out/COPYING $out/LICENSE* $out/docs
for i in $out/bin/*; do for i in $out/bin/*; do
wrapProgram $i \ wrapProgram $i \
@ -22,7 +24,7 @@ stdenv.mkDerivation {
done done
''; '';
meta = { meta = {
description = "Ruby interpreter written in Java"; description = "Ruby interpreter written in Java";
homepage = http://jruby.org/; homepage = http://jruby.org/;
license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those