diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a11ced3bb8d02..d2519d68fb576 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4291,6 +4291,12 @@ githubId = 1436960; name = "Christoph Hrdinka"; }; + hrhino = { + email = "hora.rhino@gmail.com"; + github = "hrhino"; + githubId = 28076058; + name = "Harrison Houghton"; + }; hschaeidt = { email = "he.schaeidt@gmail.com"; github = "hschaeidt"; diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix new file mode 100644 index 0000000000000..e379bf4e38e94 --- /dev/null +++ b/pkgs/development/compilers/scala-runners/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, jre, coursier }: + +stdenv.mkDerivation rec { + pname = "scala-runners"; + version = "unstable-2020-02-02"; + + src = fetchFromGitHub { + repo = pname; + owner = "dwijnand"; + rev = "95e03c9f9de0fe0ab61eeb6dea2a364f9d081d31"; + sha256 = "0mvlc6fxsh5d6gsyak9n3g98g4r061n8pir37jpiqb7z00m9lfrx"; + }; + + installPhase = '' + mkdir -p $out/bin $out/lib + sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner + cp scala-runner $out/lib + ln -s $out/lib/scala-runner $out/bin/scala + ln -s $out/lib/scala-runner $out/bin/scalac + ln -s $out/lib/scala-runner $out/bin/scalap + ln -s $out/lib/scala-runner $out/bin/scaladoc + ''; + + meta = with lib; { + homepage = "https://github.com/dwijnand/scala-runners"; + description = "An alternative implementation of the Scala distribution's runners"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ hrhino ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 837b1496cdaf2..c47a24636517c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12017,6 +12017,10 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; scala = scala_2_13; + scala-runners = callPackage ../development/compilers/scala-runners/default.nix { + coursier = coursier.override { jre = jdk8; }; + jre = jdk8; + }; metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { };