[Nix-dev] [PATCH] adding scala-2.8.0RC5

[Marc Weber]

---
 pkgs/development/compilers/scala/default.nix |   26 ++++++++++++++++++++------
 pkgs/top-level/all-packages.nix              |    3 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 3f82478..7cbb893 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,19 +1,33 @@
-args: with args;
+{ fetchurl
+, stdenv
+, version ? "2.7.7"
+, ...}:
 
 # at runtime, need jre or jdk
 
 stdenv.mkDerivation rec {
-  name = "scala-2.7.7";
 
-  src = fetchurl {
-    url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tgz";
-    md5 = "5d2294d5aab72fec869c0ba666d28b7e";
-  };
+  name = "scala-${version}";
+
+  src = if version == "2.7.7" then
+    fetchurl {
+      url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tgz";
+      md5 = "5d2294d5aab72fec869c0ba666d28b7e";
+    }
+  else if version == "2.8.0.RC5" then
+    fetchurl {
+      url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz";
+      md5 = "52658e7e34f8670c436a636a2914ca1d";
+    }
+  else throw "no source specified";
 
   installPhase = ''
     ensureDir $out
     rm bin/*.bat
     mv * $out
+    for x in $out/bin/*; do
+      ln -s $x $x-${version}
+    done
   '';
 
   phases = "unpackPhase installPhase";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 537a2cd..5f1c9bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2638,9 +2638,10 @@ let
     inherit makeWrapper clisp;
   };
 
-  scala = import ../development/compilers/scala {
+  scala = makeOverridable (import ../development/compilers/scala) {
     inherit stdenv fetchurl;
   };
+  scalaRC = lowPrio ( scala.override { version = "2.8.0.RC5"; } );
 
   stalin = import ../development/compilers/stalin {
     inherit stdenv fetchurl ncompress;
-- 
1.7.1