Merge pull request #171641 from raboof/rename-dotty-scala_3

dotty: rename to scala_3

3 files changed, 25 insertions, 25 deletions

diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/bare.nix
index b954fdbe1edc..40a70ef2baa4 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/bare.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.1.0";
-  pname = "dotty-bare";
+  pname = "scala-bare";
 
   src = fetchurl {
     url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
new file mode 100644
index 000000000000..11787f1aa690
--- /dev/null
+++ b/pkgs/development/compilers/scala/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, makeWrapper, jre, callPackage }:
+
+let
+  bare = callPackage ./bare.nix {
+    inherit stdenv fetchurl makeWrapper jre;
+  };
+in
+
+stdenv.mkDerivation {
+  pname = "scala";
+  inherit (bare) version;
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${bare}/bin/scalac $out/bin/scalac
+    ln -s ${bare}/bin/scaladoc $out/bin/scaladoc
+    ln -s ${bare}/bin/scala $out/bin/scala
+    ln -s ${bare}/bin/common $out/bin/common
+  '';
+
+  inherit (bare) meta;
+}
diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix
deleted file mode 100644
index 1cd187f2e540..000000000000
--- a/pkgs/development/compilers/scala/dotty.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, callPackage }:
-
-let
-  dotty-bare = callPackage ./dotty-bare.nix {
-    inherit stdenv fetchurl makeWrapper jre;
-  };
-in
-
-stdenv.mkDerivation {
-  pname = "dotty";
-  inherit (dotty-bare) version;
-
-  dontUnpack = true;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    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;
-}