diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/scala/dotty.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 17 insertions, 12 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3f95e7638ac3..97bbbdceabac 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -325,6 +325,7 @@ kaiha = "Kai Harries <kai.harries@gmail.com>"; kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>"; kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>"; + karolchmist = "karolchmist <info+nix@chmist.com>"; kentjames = "James Kent <jameschristopherkent@gmail.com"; kevincox = "Kevin Cox <kevincox@kevincox.ca>"; khumba = "Bryan Gardiner <bog@khumba.net>"; diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index cc02c7534f4d..cb0c43550022 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -16,19 +16,21 @@ stdenv.mkDerivation rec { mkdir -p $out mv * $out - for p in $out/bin/* ; do - file=$(basename $p) + mkdir -p $out/shared + mv $out/bin/common $out/shared + ''; - # no need to wrap common - if [[ "$file" = "common" ]] ; then - continue - fi + fixupPhase = '' + for file in $out/bin/* ; do + substituteInPlace $file \ + --replace '$PROG_HOME/bin/common' $out/shared/common - wrapProgram $p --set JAVA_HOME ${jre} - done + wrapProgram $file \ + --set JAVA_HOME ${jre} + done ''; - meta = { + meta = with stdenv.lib; { description = "Research platform for new language concepts and compiler technologies for Scala."; longDescription = '' Dotty is a platform to try out new language concepts and compiler technologies for Scala. @@ -37,7 +39,8 @@ stdenv.mkDerivation rec { The theory behind these constructs is researched in DOT, a calculus for dependent object types. ''; homepage = http://dotty.epfl.ch/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [maintainers.karolchmist]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7af3e99bd2e0..1f70d5695848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5479,6 +5479,8 @@ with pkgs; devpi-client = callPackage ../development/tools/devpi-client {}; + dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; + drumstick = callPackage ../development/libraries/drumstick { }; ecl = callPackage ../development/compilers/ecl { }; @@ -6264,7 +6266,6 @@ with pkgs; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; - scala_dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; scala = scala_2_12; scalafmt = callPackage ../development/tools/scalafmt { }; |