mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-03 02:33:15 +00:00
Merge pull request #315867 from raboof/scala-make-scala3-the-default
scala: make scala 3 the default
This commit is contained in:
commit
a4ccd68e93
@ -3117,7 +3117,7 @@ with pkgs;
|
||||
inherit (callPackages ../development/tools/ammonite {})
|
||||
ammonite_2_12
|
||||
ammonite_2_13;
|
||||
ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13;
|
||||
ammonite = ammonite_2_13;
|
||||
|
||||
amp = callPackage ../applications/editors/amp { };
|
||||
|
||||
@ -16780,7 +16780,7 @@ with pkgs;
|
||||
scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; };
|
||||
scala_3 = callPackage ../development/compilers/scala { };
|
||||
|
||||
scala = scala_2_13;
|
||||
scala = scala_3;
|
||||
scala-runners = callPackage ../development/compilers/scala-runners {
|
||||
coursier = coursier.override { jre = jdk8; };
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user