diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-05-18 08:27:37 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-05-18 08:27:37 -0500 |
commit | c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b (patch) | |
tree | b6410ef8faad5fc2772d5f1a4759bd87fab29262 /pkgs/development/interpreters | |
parent | 7d16157c877b5246d48a0e6e5d91cc430914369f (diff) | |
parent | 384db64d9540d2570d3be1ee52a057692050e7da (diff) | |
download | nixlib-c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b.tar nixlib-c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b.tar.gz nixlib-c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b.tar.bz2 nixlib-c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b.tar.lz nixlib-c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b.tar.xz nixlib-c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b.tar.zst nixlib-c8dd0f68d794ed45d3c8a28631b6a9d0ffdabf2b.zip |
Merge pull request #2350 from wizeman/u/upd-jruby
jruby: Update from 1.6.5.1 to 1.7.12
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/jruby/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index b171492d78cb..f70fb164623b 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, makeWrapper, jre }: -stdenv.mkDerivation { - name = "jruby-1.6.5.1"; +stdenv.mkDerivation rec { + name = "jruby-${version}"; + + version = "1.7.12"; src = fetchurl { - url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz; - sha256 = "1j0iv1q950lyir9vqfgg2533f1q28jaz7vnxqswsaix1mjhm29qd"; + url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz"; + sha1 = "056cee1138e49da40a77f179b771372692479002"; }; buildInputs = [ makeWrapper ]; @@ -14,7 +16,7 @@ stdenv.mkDerivation { mkdir -pv $out mv * $out 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 wrapProgram $i \ @@ -22,7 +24,7 @@ stdenv.mkDerivation { done ''; - meta = { + meta = { description = "Ruby interpreter written in Java"; homepage = http://jruby.org/; license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those |