From 7cc95a01dea4dc2b504f6b9e52009298cc61c5da Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 21 Nov 2021 12:32:21 +0200 Subject: [PATCH 1/3] scala_2_12: use latest JDK Java 17 and 18 are supported since 2.12.15: https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662bf9ae6ac6..b404d53d320a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12968,7 +12968,7 @@ 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_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; scala = scala_2_13; From a9ff768b992083c1af43ab2ec51cba7bf90a95f7 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 21 Nov 2021 12:33:55 +0200 Subject: [PATCH 2/3] scala_2_13: use latest JDK Java 17 and 18 are supported since 2.13.7: https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b404d53d320a..c01144913fbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12969,7 +12969,7 @@ 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"; }; - scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; + scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala = scala_2_13; scala-runners = callPackage ../development/compilers/scala-runners { From 2ea18c6aee200bb3eb44fb0c38c65b655357ea88 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 21 Nov 2021 12:35:45 +0200 Subject: [PATCH 3/3] dotty: use latest JDK --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c01144913fbe..a91b92d8ea7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11530,7 +11530,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 { };