ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21838 from volth/scala-fix-version

Browse Source 
scala: fix versions and $PATH
This commit is contained in:
Tim Steinbach 2017-01-12 13:43:15 -05:00 committed by GitHub
commit 558d13b255
4 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/scala/2.10.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
stdenv.mkDerivation rec {
name = "scala-2.10.5";
name = "scala-2.10.6";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci";
sha256 = "0rrdrndnxy8m76gppqh7yr68qfx0kxns5bwc69k4swz6va1zbbal";
};
propagatedBuildInputs = [ jre ] ;
@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
mv * $out
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
wrapProgram $out/bin/$p \
--prefix PATH ":" ${coreutils}/bin \
--prefix PATH ":" ${gnugrep}/bin \
--prefix PATH ":" ${jre}/bin \
--set JAVA_HOME ${jre}
done
'';

43
pkgs/development/compilers/scala/2.11.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
stdenv.mkDerivation rec {
name = "scala-2.11.8";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47";
};
propagatedBuildInputs = [ jre ] ;
buildInputs = [ makeWrapper ] ;
installPhase = ''
mkdir -p $out
rm "bin/"*.bat
mv * $out
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
--prefix PATH ":" ${coreutils}/bin \
--prefix PATH ":" ${gnugrep}/bin \
--prefix PATH ":" ${jre}/bin \
--set JAVA_HOME ${jre}
done
'';
meta = {
description = "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 = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
branch = "2.11";
};
}

8
pkgs/development/compilers/scala/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, jre }:
{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
stdenv.mkDerivation rec {
name = "scala-2.12.1";
@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
mv * $out
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
wrapProgram $out/bin/$p \
--prefix PATH ":" ${coreutils}/bin \
--prefix PATH ":" ${gnugrep}/bin \
--prefix PATH ":" ${jre}/bin \
--set JAVA_HOME ${jre}
done
'';

5
pkgs/top-level/all-packages.nix
View File

@ -5379,8 +5379,9 @@ in
scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
scala_2_11 = callPackage ../development/compilers/scala { };
scala = scala_2_11;
scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { };
scala_2_12 = callPackage ../development/compilers/scala { };
scala = scala_2_12;
scalafmt = callPackage ../development/tools/scalafmt { };