Merge pull request #146861 from liff/scala-jdk-updates

This commit is contained in:
Sandro
2021-11-29 13:32:22 +01:00
committed by GitHub
+3 -3
View File
@@ -11573,7 +11573,7 @@ with pkgs;
dictu = callPackage ../development/compilers/dictu { };
dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;};
dotty = callPackage ../development/compilers/scala/dotty.nix { };
ecl = callPackage ../development/compilers/ecl { };
ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { };
@@ -13021,8 +13021,8 @@ with pkgs;
scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; jre = jdk8; };
scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; };
scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; };
scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; };
scala = scala_2_13;
scala-runners = callPackage ../development/compilers/scala-runners {