jvm: simplify environments and move packages

Move JVM packages into the packages list instead of creating fat
environments.  Some development tools are dropped in the process.

Simplify `jvm-environment${version}` into simple JDK evaluations.

Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>

1 files changed, 3 insertions, 24 deletions

diff --git a/overlays/jvm/default.nix b/overlays/jvm/default.nix
index 00962175..0050d5e2 100644
--- a/overlays/jvm/default.nix
+++ b/overlays/jvm/default.nix
@@ -2,31 +2,10 @@ self: super:
 let
   utils = import ../../nix/utils.nix { pkgs = self.pkgs; };
   optimizeJDK = jdk: utils.optimizeForThisHost jdk;
-  mkMaven = jdk: (super.pkgs.maven.override {
-    jdk = jdk;
-  });
-  mkLeiningen = jdk: (super.pkgs.leiningen.override {
-    jdk = jdk;
-  });
-  mkJVMEnv = jdk: name:
-    super.buildEnv {
-      name = name;
-      ignoreCollisions = true;
-      paths = [
-        self.ammonite
-        self.aspectj
-        self.clj-kondo
-        self.eclipses.eclipse-java
-        self.jetbrains.idea-community
-        self.jmeter
-        jdk
-        self.visualvm
-      ];
-    };
 in {
-  jvm-environment8 = mkJVMEnv (optimizeJDK self.openjdk8) "jvm-environment8";
+  jvm-environment8 = optimizeJDK super.openjdk8;
 
-  jvm-environment11 = mkJVMEnv (optimizeJDK self.openjdk11) "jvm-environment11";
+  jvm-environment11 = optimizeJDK super.openjdk11;
 
-  jvm-environment14 = mkJVMEnv (optimizeJDK self.openjdk14) "jvm-environment14";
+  jvm-environment = optimizeJDK super.openjdk15;
 }