Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scala-runners: init at 0c0b369 #84068

Closed
wants to merge 2 commits into from
Closed

scala-runners: init at 0c0b369 #84068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b50012
maintainers: add hrhino
hrhino Sep 13, 2020
1547fed
scala-runners: init at 95e03c9
hrhino Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3771,6 +3771,12 @@
githubId = 1436960;
name = "Christoph Hrdinka";
};
hrhino = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the convention is to put this into a separate commit titled maintainers: add hrhino (added #96666)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done; thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also pushed a newer version because, why not.

email = "[email protected]";
github = "hrhino";
githubId = 28076058;
name = "Harrison Houghton";
};
hschaeidt = {
email = "[email protected]";
github = "hschaeidt";
Expand Down
31 changes: 31 additions & 0 deletions pkgs/development/compilers/scala-runners/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ stdenv, lib, fetchFromGitHub, jre, coursier }:

let
in stdenv.mkDerivation rec {
Comment on lines +3 to +4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {

name = "scala-runners";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "scala-runners";
pname = "scala-runners";
version = "unstable-2020-02-02"


src = fetchFromGitHub {
repo = name;
owner = "dwijnand";
rev = "95e03c9f9de0fe0ab61eeb6dea2a364f9d081d31";
sha256 = "0mvlc6fxsh5d6gsyak9n3g98g4r061n8pir37jpiqb7z00m9lfrx";
};

installPhase = ''
mkdir -p $out/bin $out/lib
sed -ie "s_\Wcs\W_ ${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 ];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10851,6 +10851,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 = callPackage ../development/tools/coursier { jre = jdk8; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
coursier = callPackage ../development/tools/coursier { jre = jdk8; };
coursier = coursier.override { jre = jdk8; };

jre = jdk8;
};

metal = callPackage ../development/libraries/metal { };
metals = callPackage ../development/tools/metals { };
Expand Down