diff options
author | Benjamin Staffin <benley@gmail.com> | 2022-03-21 18:37:45 -0400 |
---|---|---|
committer | Benjamin Staffin <bstaffin@singlestore.com> | 2022-03-21 18:37:45 -0400 |
commit | 34006ebc9d6801a7bf3d15325b05ce74faccbe2c (patch) | |
tree | bc6e6e1dfcadc89f2aa81981ab1aa1f7411c6f7e /pkgs/top-level/java-packages.nix | |
parent | 8e317c16309c7fe6f30213e705f3cecdbd2275eb (diff) | |
parent | ae1a4700452ff572082a05dceba635f04367288d (diff) |
Merge remote-tracking branch 'origin/master' into mvn
Diffstat (limited to 'pkgs/top-level/java-packages.nix')
-rw-r--r-- | pkgs/top-level/java-packages.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 6f0f802f38e82..160f51cf43c56 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -8,11 +8,12 @@ let openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; mavenfod = callPackage ../development/java-modules/maven-fod.nix { }; in { - inherit mavenbuild mavenfod fetchMaven openjfx11 openjfx15; + inherit mavenbuild mavenfod fetchMaven openjfx11 openjfx15 openjfx17; compiler = let @@ -172,7 +173,7 @@ in { ../development/compilers/openjdk/darwin/17.nix { inherit openjdk17-bootstrap; - openjfx = openjfx15; + openjfx = openjfx17; }; }; |