about summary refs log tree commit diff
path: root/pkgs/top-level/java-packages.nix
diff options
context:
space:
mode:
authorxeals <dev@xeal.me>2022-03-23 12:57:01 +1100
committerMario Rodas <marsam@users.noreply.github.com>2022-03-23 12:57:01 +1100
commitda40a449e9e77e451ebd544f926d4e7871ba7337 (patch)
tree2fa44f11099cb0433bbc43d8f928002a4249018b /pkgs/top-level/java-packages.nix
parentb6cb656c0d897050f2487e7fda9d14ebf88e0405 (diff)
openjdk18: init at 18+36
Diffstat (limited to 'pkgs/top-level/java-packages.nix')
-rw-r--r--pkgs/top-level/java-packages.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 2ac6c2735e98f..f9391267fac80 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -133,6 +133,12 @@ in {
         inherit openjdk16-bootstrap;
       });
 
+    openjdk18-bootstrap = mkBootstrap adoptopenjdk-17
+      ../development/compilers/openjdk/17.nix
+      (bootstrapArgs // {
+        inherit openjdk17-bootstrap;
+      });
+
     openjdk8 = mkOpenjdk
       ../development/compilers/openjdk/8.nix
       ../development/compilers/openjdk/darwin/8.nix
@@ -179,6 +185,14 @@ in {
         inherit openjdk17-bootstrap;
         openjfx = openjfx17;
       };
+
+    openjdk18 = mkOpenjdk
+      ../development/compilers/openjdk/18.nix
+      ../development/compilers/openjdk/darwin/18.nix
+      {
+        inherit openjdk18-bootstrap;
+        openjfx = openjfx17;
+      };
   };
 
   mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { });