about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorArnout Engelen <arnout@bzzt.net>2023-06-21 12:14:50 +0200
committerGitHub <noreply@github.com>2023-06-21 12:14:50 +0200
commite5b18e6ca93fdae364c807c4ebb294edf025a9b2 (patch)
treeb9a3da98eaefd8ceb4cb5b980e6b9b1ad404c665 /pkgs/development
parent56b3513d58c1f90b46b69f61ca4bd664645c3342 (diff)
parent9bb37b460776b2605748fa8aad098f3c4dedcf1a (diff)
Merge pull request #237874 from timothyklim/scala-latest
scala_3: 3.2.2 -> 3.3.0, scala_2_13: 2.13.10 -> 2.13.11, scala_2_12: 2.12.15 -> 2.12.18
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/scala/2.x.nix8
-rw-r--r--pkgs/development/compilers/scala/bare.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
index 7652d176230a5..e9680553e0173 100644
--- a/pkgs/development/compilers/scala/2.x.nix
+++ b/pkgs/development/compilers/scala/2.x.nix
@@ -18,14 +18,14 @@ let
     };
 
     "2.12" = {
-      version = "2.12.15";
-      sha256 = "F5RePKlHjQaoQ2BWqsa5r99g3q/cPjgsbAi2A5IberY=";
+      version = "2.12.18";
+      sha256 = "naIJCET+YPrbXln39F9aU3DBdnjcn7PYMmhDxETOA5g=";
       pname = "scala_2_12";
     };
 
     "2.13" = {
-      version = "2.13.10";
-      sha256 = "sha256-sBRhWZzQeGBCxktTN5D0XlG6u5HFLcRl2EaDjpcBnMQ=";
+      version = "2.13.11";
+      sha256 = "YYLdgdICPM5SczPteFsaojqY6H3IVauji6SJLcaq8eM=";
       pname = "scala_2_13";
     };
   };
diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix
index 0bcfe7bef7c47..33095a49b8298 100644
--- a/pkgs/development/compilers/scala/bare.nix
+++ b/pkgs/development/compilers/scala/bare.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.2";
+  version = "3.3.0";
   pname = "scala-bare";
 
   src = fetchurl {
     url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
-    hash = "sha256-t8Xt70LozePoDXE3IHejWOTWCEYcOZytRDKz/QxgmZg=";
+    hash = "sha256-Bk7lCKjjucaYQxAsg2qomJQUgCK/N688JqlGTfoQFHU=";
   };
 
   propagatedBuildInputs = [ jre ncurses.dev ] ;