Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 958350fbf7e1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ee2acb33bfa2
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jun 13, 2019

  1. scala: Init 2.13 

    Make 2.13 the default, move 2.12 from default.nix to 2.12.nix
    @NeQuissimus
    NeQuissimus committed Jun 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ee2acb3 View commit details
Showing with 49 additions and 2 deletions.
  1. 0 pkgs/development/compilers/scala/{default.nix → 2.12.nix}
  2. +46 −0 pkgs/development/compilers/scala/2.13.nix
  3. +3 −2 pkgs/top-level/all-packages.nix
0 pkgs/development/compilers/scala/default.nix → pkgs/development/compilers/scala/2.12.nix
View file
File renamed without changes.
46 changes: 46 additions & 0 deletions pkgs/development/compilers/scala/2.13.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:

stdenv.mkDerivation rec {
name = "scala-2.13.0";

src = fetchurl {
url = "https://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p";
};

propagatedBuildInputs = [ jre ] ;
buildInputs = [ makeWrapper ] ;

installPhase = ''
mkdir -p $out
rm "bin/"*.bat
mv * $out
# put docs in correct subdirectory
mkdir -p $out/share/doc
mv $out/doc $out/share/doc/scala
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 = https://www.scala-lang.org/;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}
5 changes: 3 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8044,8 +8044,9 @@ in

scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { };
scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; };
scala = scala_2_12;
scala_2_12 = callPackage ../development/compilers/scala/2.12.nix { jre = jre8; };
scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; };
scala = scala_2_13;

scalafix = callPackage ../development/tools/scalafix { };
scalafmt = callPackage ../development/tools/scalafmt { };