Merge branch 'master' into staging

This commit is contained in:
Thomas Tuegel
2015-06-25 09:15:05 -05:00
117 changed files with 13095 additions and 14673 deletions

View File

@@ -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 ];

View File

@@ -31,11 +31,11 @@ in
stdenv.mkDerivation rec {
name = "racket-${version}";
version = "6.1.1";
version = "6.2";
src = fetchurl {
url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
sha256 = "090269522d20e7a5ce85d2251a126745746ebf5e87554c05efe03f3b7173da75";
sha256 = "05g60fzb9dzf52xj9n7s4prybwbr8dqjq94mbdmw5cxk88vi2c8k";
};
FONTCONFIG_FILE = fontsConf;