diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2018-03-21 11:45:05 +0900 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-03-23 13:40:13 -0500 |
| commit | d2d859d5c54db6c0008ab01d0e56d5300f592c10 (patch) | |
| tree | 4a900229eff6cba06846979103f81106ec991aef /pkgs/top-level | |
| parent | a2c37c0700cdc014c95cdd588e672e9944c8d163 (diff) | |
oraclejdk: add version 10
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85fbb8894ecc4..1c815c2be5edf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6426,6 +6426,8 @@ with pkgs; oraclejdk9 = pkgs.oraclejdk9distro "JDK" false; + oraclejdk10 = pkgs.oraclejdk10distro "JDK" false; + oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); @@ -6434,8 +6436,12 @@ with pkgs; oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false); + oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false); + oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false); + oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false); + jrePlugin = jre8Plugin; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); @@ -6454,6 +6460,10 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); + oraclejdk10distro = packageType: pluginSupport: + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); + jikes = callPackage ../development/compilers/jikes { }; julia_04 = callPackage ../development/compilers/julia { |