scala: Bump to 2.11.0, bump 2.10 to 2.10.4

This commit is contained in:
Ricky Elrod 2014-05-05 02:14:57 -04:00
parent 97262a59b5
commit d66cdd3c43
3 changed files with 42 additions and 4 deletions

View file

@ -0,0 +1,37 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "scala-2.10.4";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "1hqhm1xvd7g78jspvl30zgdzw79xq5zl837h47p6w1n6qlwbcvdl";
};
buildInputs = [ jre makeWrapper ] ;
installPhase = ''
mkdir -p $out
rm bin/*.bat
mv * $out
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
done
'';
meta = {
description = "Scala is a general purpose programming language";
longDescription = ''
Scala is a general purpose programming language designed to express
common programming patterns in a concise, elegant, and type-safe way.
It smoothly integrates features of object-oriented and functional
languages, enabling Java and other programmers to be more productive.
Code sizes are typically reduced by a factor of two to three when
compared to an equivalent Java application.
'';
homepage = http://www.scala-lang.org/;
license = "BSD";
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "scala-2.10.3";
name = "scala-2.11.0";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "16ac935wydrxrvijv4ldnz4vl2xk8yb3yzb9bsi3nb9sic7fxl95";
sha256 = "00lap31c6rxvg7vipmj0j7f4mv6c58wpfyd3785bxwlhrzmmwgq7";
};
buildInputs = [ jre makeWrapper ] ;

View file

@ -3211,8 +3211,9 @@ let
};
scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
scala_2_10 = callPackage ../development/compilers/scala { };
scala = scala_2_10;
scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
scala_2_11 = callPackage ../development/compilers/scala { };
scala = scala_2_11;
sdcc = callPackage ../development/compilers/sdcc { };