diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2020-03-21 20:44:42 -0400 |
|---|---|---|
| committer | Milan <me@pbb.lc> | 2020-05-07 18:18:32 +0200 |
| commit | 54af71026973d4cf567d100297998ed6b6850930 (patch) | |
| tree | fedd5fcb159dc34995d6c85010dd4df65b8f5847 /pkgs/top-level/all-packages.nix | |
| parent | 7b7cb7b876a6f663dd0eb93a9bdd40d554e20ae8 (diff) | |
| download | nixlib-54af71026973d4cf567d100297998ed6b6850930.tar nixlib-54af71026973d4cf567d100297998ed6b6850930.tar.gz nixlib-54af71026973d4cf567d100297998ed6b6850930.tar.bz2 nixlib-54af71026973d4cf567d100297998ed6b6850930.tar.lz nixlib-54af71026973d4cf567d100297998ed6b6850930.tar.xz nixlib-54af71026973d4cf567d100297998ed6b6850930.tar.zst nixlib-54af71026973d4cf567d100297998ed6b6850930.zip | |
openjdk: 13.0.2 -> 14.0.1
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23cb5d01d670..0d0bd9b06e0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8624,7 +8624,7 @@ in openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { }; + openjfx14 = callPackage ../development/compilers/openjdk/openjfx/14.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -8669,33 +8669,39 @@ in else openjdk11.override { headless = true; }; - openjdk13-bootstrap = + openjdk14-bootstrap = if adoptopenjdk-hotspot-bin-13.meta.available then adoptopenjdk-hotspot-bin-13 else - /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */ - callPackage ../development/compilers/openjdk/12.nix { + /* adoptopenjdk not available for i686, so fall back to our old builds of 12 & 13 for bootstrapping */ + callPackage ../development/compilers/openjdk/13.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; + openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; }; /* current JDK */ - openjdk13 = + openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx13; + openjfx = openjfx14; inherit (gnome2) GConf gnome_vfs; }; - openjdk13_headless = + openjdk14_headless = if stdenv.isDarwin then - openjdk13 + openjdk14 else - openjdk13.override { headless = true; }; + openjdk14.override { headless = true; }; openjdk = openjdk8; openjdk_headless = openjdk8_headless; @@ -8707,8 +8713,8 @@ in jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - jdk13 = openjdk13; - jdk13_headless = openjdk13_headless; + jdk14 = openjdk14; + jdk14_headless = openjdk14_headless; jdk = jdk8; jre = jre8; |