From f1e6327a874bdf32ac2246084f81a7133ba69926 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 30 May 2024 14:08:14 +0200 Subject: [PATCH] scala: make scala 3 the default It has been the primary recommended version on https://www.scala-lang.org/ for a while now. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deea25bd1f13..1faacedfd6fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3126,7 +3126,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 { }; @@ -16831,7 +16831,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; }; };