diff options
| author | sohalt <sohalt@sohalt.net> | 2023-05-16 09:39:17 +0200 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-07-02 07:52:14 +0800 |
| commit | eacd9ad04d57f166a538d5642d5e1753c90f2416 (patch) | |
| tree | d9499df0227ccc0829a6ce20a27ce9712ac0f75e /pkgs/top-level | |
| parent | f1aea5075400803ba5c57e4964089316547033b9 (diff) | |
openjdk: init at 20+36 and openjfx: init at 20+19
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46d31bb0b1fe9..053e9b66b0fb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15881,7 +15881,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19; + inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; @@ -15911,6 +15911,11 @@ with pkgs; jdk19 = openjdk19; jdk19_headless = openjdk19_headless; + openjdk20 = javaPackages.compiler.openjdk20; + openjdk20_headless = javaPackages.compiler.openjdk20.headless; + jdk20 = openjdk20; + jdk20_headless = openjdk20_headless; + /* default JDK */ jdk = jdk19; jdk_headless = jdk19_headless; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 98567c7b9fcae..7439ba7892fbe 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -7,11 +7,12 @@ let openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; + openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { }; mavenfod = pkgs.maven.buildMavenPackage; in { - inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19; + inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; compiler = let @@ -201,6 +202,14 @@ in { openjfx = openjfx19; }; + openjdk20 = mkOpenjdk + ../development/compilers/openjdk/20.nix + ../development/compilers/openjdk/darwin/20.nix + { + openjdk20-bootstrap = temurin-bin.jdk-20; + openjfx = openjfx20; + }; + temurin-bin = recurseIntoAttrs (callPackage ( if stdenv.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix |