added scala an object oriented and functional programming language

svn path=/nixpkgs/trunk/; revision=11593

2 files changed, 23 insertions, 7 deletions

diff --git a/pkgs/development/compilers/jdk/default.nix b/pkgs/development/compilers/jdk/default.nix
index d7921d540023..6de5faa6026d 100644
--- a/pkgs/development/compilers/jdk/default.nix
+++ b/pkgs/development/compilers/jdk/default.nix
@@ -1,10 +1,22 @@
-args:
+args: with args;
 
-if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then
-  (import ./jdk6-linux.nix) args
+stdenv.mkDerivation rec {
+  name = "scala-2.7.0-final";
 
-else if args.stdenv.system == "powerpc-linux"  then
-  (import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["libstdcpp5" "pluginSupport" "xlibs" "installjdk"])
+  src = fetchurl {
+    url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tar.bz2";
+    sha256 = "17b9711bfddac611e907659cab4cb51f4114b886bbee243274d774b691dae248";
+  };
 
-else
-  abort "the JDK is not supported on this platform"
+  installPhase = ''
+    mkdir -p $out
+    mv * $out
+    rm -f $out/bin/*.bat
+  '';
+
+  phases = "unpackPhase installPhase";
+
+  meta = {
+    description = "Scala is a general purpose programming language";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a6ea6282a82..2f0139b6167a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1635,6 +1635,10 @@ let pkgs = rec {
     inherit mysql libxml2 fcgi;
   };
 
+  scala = import ../development/compilers/scala {
+    inherit stdenv fetchurl;
+  };
+
   strategoLibraries = import ../development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix {
     inherit stdenv fetchurl pkgconfig aterm;
   };