dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

jdk: point attributes without version suffix to latest

Browse Source 
For too long `jdk` was pointing to the legacy, unmaintained openjdk8 and
too many apps are using it just because it works.
This commit is contained in:
Doron Behar 2020-06-07 13:43:22 +03:00 committed by Gabriel Ebner
parent 54a0a400f2
commit 48978fb8d0
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/top-level/all-packages.nix
View File

@ -9173,6 +9173,11 @@ in
else else
openjdk8.override { headless = true; }; openjdk8.override { headless = true; };
jdk8 = openjdk8;
jdk8_headless = openjdk8_headless;
jre8 = openjdk8.jre;
jre8_headless = openjdk8_headless.jre;
openjdk11-bootstrap = openjdk11-bootstrap =
if adoptopenjdk-hotspot-bin-11.meta.available then if adoptopenjdk-hotspot-bin-11.meta.available then
adoptopenjdk-hotspot-bin-11 adoptopenjdk-hotspot-bin-11
@ -9213,7 +9218,10 @@ in
}; };
}; };
/* current JDK */ jdk11 = openjdk11;
jdk11_headless = openjdk11_headless;
/* Latest JDK */
openjdk14 = openjdk14 =
if stdenv.isDarwin then if stdenv.isDarwin then
callPackage ../development/compilers/openjdk/darwin { } callPackage ../development/compilers/openjdk/darwin { }
@ -9229,23 +9237,18 @@ in
else else
openjdk14.override { headless = true; }; openjdk14.override { headless = true; };
openjdk = openjdk8;
openjdk_headless = openjdk8_headless;
jdk8 = openjdk8;
jdk8_headless = openjdk8_headless;
jre8 = openjdk8.jre;
jre8_headless = openjdk8_headless.jre;
jdk11 = openjdk11;
jdk11_headless = openjdk11_headless;
jdk14 = openjdk14; jdk14 = openjdk14;
jdk14_headless = openjdk14_headless; jdk14_headless = openjdk14_headless;
jdk = jdk8; /* default JDK */
jre = jre8;
jre_headless = jre8_headless; jdk = jdk14;
# jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490
jre = jdk14;
jre_headless = jdk14_headless;
openjdk = openjdk14;
openjdk_headless = openjdk14_headless;
inherit (callPackages ../development/compilers/graalvm { inherit (callPackages ../development/compilers/graalvm {
gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc;