From b0f0e1d175655a529a250aa6ec1a73c703803e0a Mon Sep 17 00:00:00 2001 From: skykanin <3789764+skykanin@users.noreply.github.com> Date: Tue, 27 Apr 2021 22:26:25 +0200 Subject: [PATCH] dotty: 0.26.0-RC1 -> 3.0.0-RC3 --- pkgs/development/compilers/scala/dotty-bare.nix | 6 +++--- pkgs/development/compilers/scala/dotty.nix | 7 ++++--- 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;