From 1e80c57274b7e2877ac554b5a51f868253fafdc1 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 9 Nov 2013 17:14:05 -0430 Subject: [PATCH] scala: add expression for scala 2.10.x branch. --- pkgs/development/compilers/scala/2.9.nix | 34 ++++++++++++++++++++ pkgs/development/compilers/scala/default.nix | 17 ++++++---- pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/compilers/scala/2.9.nix diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix new file mode 100644 index 00000000000..a7c9dbc9073 --- /dev/null +++ b/pkgs/development/compilers/scala/2.9.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +# at runtime, need jre or jdk + +stdenv.mkDerivation rec { + name = "scala-2.9.2"; + + src = fetchurl { + url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz"; + sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46"; + }; + + installPhase = '' + mkdir -p $out + rm bin/*.bat + rm lib/scalacheck.jar + mv * $out + ''; + + 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; + }; +} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a7c9dbc9073..c128baf5100 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl }: - -# at runtime, need jre or jdk +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.9.2"; + name = "scala-2.10.3"; src = fetchurl { - url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz"; - sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46"; + url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + sha256 = "16ac935wydrxrvijv4ldnz4vl2xk8yb3yzb9bsi3nb9sic7fxl95"; }; + buildInputs = [ jre makeWrapper ] ; + installPhase = '' mkdir -p $out rm bin/*.bat - rm lib/scalacheck.jar mv * $out + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + done ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23612638ceb..52a6ef0764a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3007,7 +3007,9 @@ let inherit makeWrapper clisp; }; - scala = callPackage ../development/compilers/scala { }; + scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; + scala_2_10 = callPackage ../development/compilers/scala { }; + scala = scala_2_10; sdcc = callPackage ../development/compilers/sdcc { boost = boost149; # sdcc 3.2.0 fails to build with boost 1.53