summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2021-01-28 11:34:05 -0500
committerTim Steinbach <NeQuissimus@users.noreply.github.com>2021-02-03 10:24:42 -0500
commit0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951 (patch)
treea122715e96b892cecf9be21ae155646fcb57a855 /nixos/tests
parentab5a9d5746c910ceb9b60193bf135510c3f32010 (diff)
downloadnixpkgs-0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951.tar
nixpkgs-0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951.tar.gz
nixpkgs-0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951.tar.bz2
nixpkgs-0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951.tar.lz
nixpkgs-0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951.tar.xz
nixpkgs-0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951.tar.zst
nixpkgs-0d3bf0781fc7261ccb1ef61d3fbccdcb69d60951.zip
scala: Replace VM test with installCheckPhase
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--nixos/tests/scala.nix33
2 files changed, 0 insertions, 34 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d0254c83a77..4ea2dc44d5a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -345,7 +345,6 @@ in
   sanoid = handleTest ./sanoid.nix {};
   sbt = handleTest ./sbt.nix {};
   sbt-extras = handleTest ./sbt-extras.nix {};
-  scala = handleTest ./scala.nix {};
   sddm = handleTest ./sddm.nix {};
   searx = handleTest ./searx.nix {};
   service-runner = handleTest ./service-runner.nix {};
diff --git a/nixos/tests/scala.nix b/nixos/tests/scala.nix
deleted file mode 100644
index 4fc3f8aa7b0..00000000000
--- a/nixos/tests/scala.nix
+++ /dev/null
@@ -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;
-}