From 2a465c083902b9e4f0321d1b160a9526c6dc13f5 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Sun, 13 Sep 2020 14:15:13 -0400 Subject: [PATCH 1/2] maintainers: add hrhino --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ac912b23a0..9446317a2c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4285,6 +4285,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"; From 246b757d26c925eaf19580a2a067d93ed36bd852 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Wed, 1 Apr 2020 22:48:59 -0400 Subject: [PATCH 2/2] scala-runners: init at unstable-2020-02-02 This is a script to run multiple versions of scala either by version number or build hash. --- .../compilers/scala-runners/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/compilers/scala-runners/default.nix diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix new file mode 100644 index 00000000000..e379bf4e38e --- /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 44b7da094ee..62a14c784ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12014,6 +12014,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 { };