git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146861 from liff/scala-jdk-updates
commit28517d5fa22ec8cbe734baadfc2ea32b30e902fa authorSandro <sandro.jaeckel@gmail.com> dateMon 29 Nov 2021, 13:32 (5 years ago) parent864a1432ea18c6
1 file changed+3−3
compare with master
unifiedsplit
pkgs/top-level/all-packages.nix+3−3
pkgs/top-level/all-packages.nix+3−3
@@ -11573,7 +11573,7 @@ with pkgs;
1157311573
1157411574 dictu = callPackage ../development/compilers/dictu { };
1157511575
11576− dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;};
11576+ dotty = callPackage ../development/compilers/scala/dotty.nix { };
1157711577
1157811578 ecl = callPackage ../development/compilers/ecl { };
1157911579 ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { };
@@ -13021,8 +13021,8 @@ with pkgs;
1302113021
1302213022 scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
1302313023 scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
13024− scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; jre = jdk8; };
13025− scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; };
13024+ scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; };
13025+ scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; };
1302613026
1302713027 scala = scala_2_13;
1302813028 scala-runners = callPackage ../development/compilers/scala-runners {