summary refs log tree commit diff
diff options
context:
space:
mode:
authorskykanin <3789764+skykanin@users.noreply.github.com>2021-04-27 22:26:25 +0200
committerskykanin <3789764+skykanin@users.noreply.github.com>2021-04-27 22:26:25 +0200
commitb0f0e1d175655a529a250aa6ec1a73c703803e0a (patch)
tree7af8832a3cd3061416bfafddb31979d9d47b0d48
parent093c7395732496848b7c89eb0210151a8744ed92 (diff)
downloadnixpkgs-b0f0e1d175655a529a250aa6ec1a73c703803e0a.tar
nixpkgs-b0f0e1d175655a529a250aa6ec1a73c703803e0a.tar.gz
nixpkgs-b0f0e1d175655a529a250aa6ec1a73c703803e0a.tar.bz2
nixpkgs-b0f0e1d175655a529a250aa6ec1a73c703803e0a.tar.lz
nixpkgs-b0f0e1d175655a529a250aa6ec1a73c703803e0a.tar.xz
nixpkgs-b0f0e1d175655a529a250aa6ec1a73c703803e0a.tar.zst
nixpkgs-b0f0e1d175655a529a250aa6ec1a73c703803e0a.zip
dotty: 0.26.0-RC1 -> 3.0.0-RC3
-rw-r--r--pkgs/development/compilers/scala/dotty-bare.nix6
-rw-r--r--pkgs/development/compilers/scala/dotty.nix7
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix
index 66a634914df..66b6cf7737a 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/dotty-bare.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "0.26.0-RC1";
+  version = "3.0.0-RC3";
   pname = "dotty-bare";
 
   src = fetchurl {
-    url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
-    sha256 = "16njy9f0lk7q5x5w1k4yqy644005w4cxhq20r8i2qslhxjndz66f";
+    url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
+    sha256 = "1xp9nql2l62fra8p29fgk3srdbvza9g5inxr8p0sihsrp0bgxa0m";
   };
 
   propagatedBuildInputs = [ jre ncurses.dev ] ;
diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix
index 7bc7fa3d4c2..c99ed24c214 100644
--- a/pkgs/development/compilers/scala/dotty.nix
+++ b/pkgs/development/compilers/scala/dotty.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    ln -s ${dotty-bare}/bin/dotc $out/bin/dotc
-    ln -s ${dotty-bare}/bin/dotd $out/bin/dotd
-    ln -s ${dotty-bare}/bin/dotr $out/bin/dotr
+    ln -s ${dotty-bare}/bin/scalac $out/bin/scalac
+    ln -s ${dotty-bare}/bin/scaladoc $out/bin/scaladoc
+    ln -s ${dotty-bare}/bin/scala $out/bin/scala
+    ln -s ${dotty-bare}/bin/common $out/bin/common
   '';
 
   inherit (dotty-bare) meta;