public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scala: Replace VM test with installCheckPhase

This commit is contained in:
Tim Steinbach 2021-01-28 11:34:05 -05:00 committed by Tim Steinbach
parent ab5a9d5746
commit 0d3bf0781f
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View File

@ -345,7 +345,6 @@ in
sanoid = handleTest ./sanoid.nix {}; sanoid = handleTest ./sanoid.nix {};
sbt = handleTest ./sbt.nix {}; sbt = handleTest ./sbt.nix {};
sbt-extras = handleTest ./sbt-extras.nix {}; sbt-extras = handleTest ./sbt-extras.nix {};
scala = handleTest ./scala.nix {};
sddm = handleTest ./sddm.nix {}; sddm = handleTest ./sddm.nix {};
searx = handleTest ./searx.nix {}; searx = handleTest ./searx.nix {};
service-runner = handleTest ./service-runner.nix {}; service-runner = handleTest ./service-runner.nix {};

33
nixos/tests/scala.nix
View File

@ -1,33 +0,0 @@
{ system ? builtins.currentSystem,
config ? {},
pkgs ? import ../.. { inherit system config; }
}:
with pkgs.lib;
let
common = name: package: (import ./make-test-python.nix ({
inherit name;
meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
nodes = {
scala = { ... }: {
environment.systemPackages = [ package ];
};
};
testScript = ''
start_all()
scala.succeed("scalac -version 2>&1 | grep '^Scala compiler version ${package.version}'")
'';
}) { inherit system; });
in with pkgs; {
scala_2_10 = common "scala_2_10" scala_2_10;
scala_2_11 = common "scala_2_11" scala_2_11;
scala_2_12 = common "scala_2_12" scala_2_12;
scala_2_13 = common "scala_2_13" scala_2_13;
}

12
pkgs/development/compilers/scala/2.x.nix
View File

@ -10,28 +10,24 @@ let
"2.10" = { "2.10" = {
version = "2.10.7"; version = "2.10.7";
sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE="; sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE=";
tests = [ nixosTests.scala.scala_2_10 ];
pname = "scala_2_10"; pname = "scala_2_10";
}; };
"2.11" = { "2.11" = {
version = "2.11.12"; version = "2.11.12";
sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg="; sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg=";
tests = [ nixosTests.scala.scala_2_11 ];
pname = "scala_2_11"; pname = "scala_2_11";
}; };
"2.12" = { "2.12" = {
version = "2.12.13"; version = "2.12.13";
sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc"; sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc";
tests = [ nixosTests.scala.scala_2_12 ];
pname = "scala_2_12"; pname = "scala_2_12";
}; };
"2.13" = { "2.13" = {
version = "2.13.4"; version = "2.13.4";
sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw"; sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
tests = [ nixosTests.scala.scala_2_13 ];
pname = "scala_2_13"; pname = "scala_2_13";
}; };
}; };
@ -69,8 +65,14 @@ stdenv.mkDerivation rec {
done done
''; '';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/scalac -version 2>&1 | grep '^Scala compiler version ${version}'
echo 'println("foo"*3)' | $out/bin/scala 2>/dev/null | grep "foofoofoo"
'';
passthru = { passthru = {
inherit tests;
updateScript = writeScript "update.sh" '' updateScript = writeScript "update.sh" ''
#!${stdenv.shell} #!${stdenv.shell}
set -o errexit set -o errexit