about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorSerg Nesterov <i.am.cust0dian@gmail.com>2021-03-20 03:11:52 +0300
committerSerg Nesterov <i.am.cust0dian@gmail.com>2021-03-22 01:18:50 +0300
commit05a48020fd7b486d1333fc616f6788b36c116740 (patch)
treebdd8e56d0c19a99063fbd547c4cd0b00294cea4f /pkgs/top-level
parentdec0d32d7c1634f0c5fe6e24b0725cf630f07d3b (diff)
downloadnixlib-05a48020fd7b486d1333fc616f6788b36c116740.tar
nixlib-05a48020fd7b486d1333fc616f6788b36c116740.tar.gz
nixlib-05a48020fd7b486d1333fc616f6788b36c116740.tar.bz2
nixlib-05a48020fd7b486d1333fc616f6788b36c116740.tar.lz
nixlib-05a48020fd7b486d1333fc616f6788b36c116740.tar.xz
nixlib-05a48020fd7b486d1333fc616f6788b36c116740.tar.zst
nixlib-05a48020fd7b486d1333fc616f6788b36c116740.zip
adoptopenjdk: add 16.0.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix18
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd33fdf584fb..aaeced49bbdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9661,6 +9661,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;