MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 08:36:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
dotty: rename to scala_3
This commit is contained in:
Arnout Engelen 2022-05-25 14:11:57 +02:00 committed by GitHub
commit b27f78f56e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/scala/dotty-bare.nix → pkgs/development/compilers/scala/bare.nix
View file

@ -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";

24
pkgs/development/compilers/scala/default.nix Normal file
View file

@ -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;
}

24
pkgs/development/compilers/scala/dotty.nix
View file

@ -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;
}

5
pkgs/top-level/all-packages.nix
View file

@ -12449,8 +12449,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 { };
@ -13890,6 +13888,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 {