diff options
| author | taku0 <taku0@users.noreply.github.com> | 2021-03-26 10:34:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 10:34:23 +0900 |
| commit | 44ccf965bd8b9074b6b1015d45052a92fde1a4f7 (patch) | |
| tree | eda27261bc908b5144152fc773eb9bc2a404a267 /pkgs/top-level | |
| parent | df63ef42fcb22bcb52ea1c43a4e05a9a722f27e8 (diff) | |
| parent | 05a48020fd7b486d1333fc616f6788b36c116740 (diff) | |
| download | nixlib-44ccf965bd8b9074b6b1015d45052a92fde1a4f7.tar nixlib-44ccf965bd8b9074b6b1015d45052a92fde1a4f7.tar.gz nixlib-44ccf965bd8b9074b6b1015d45052a92fde1a4f7.tar.bz2 nixlib-44ccf965bd8b9074b6b1015d45052a92fde1a4f7.tar.lz nixlib-44ccf965bd8b9074b6b1015d45052a92fde1a4f7.tar.xz nixlib-44ccf965bd8b9074b6b1015d45052a92fde1a4f7.tar.zst nixlib-44ccf965bd8b9074b6b1015d45052a92fde1a4f7.zip | |
Merge pull request #116781 from cust0dian/adoptopenjdk-16
adoptopenjdk-bin: add 16.0.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 809383449245..7da1acd8af52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9684,6 +9684,24 @@ in jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix; + adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + + adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; |