diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/bare.nix similarity index 98% rename from pkgs/development/compilers/scala/dotty-bare.nix rename to pkgs/development/compilers/scala/bare.nix index b954fdbe1ed..40a70ef2baa 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 00000000000..11787f1aa69 --- /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 1cd187f2e54..00000000000 --- 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; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aca0f5950a..e34b0848b6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12400,8 +12400,6 @@ with pkgs; dictu = callPackage ../development/compilers/dictu { }; - dotty = callPackage ../development/compilers/scala/dotty.nix { }; - ecl = callPackage ../development/compilers/ecl { }; ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; @@ -13805,6 +13803,9 @@ with pkgs; scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; + scala_3 = callPackage ../development/compilers/scala { }; + # deprecated + dotty = scala_3; scala = scala_2_13; scala-runners = callPackage ../development/compilers/scala-runners {