Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openjdk: mark major version 12 through 16 as EOL #170827

Merged
merged 1 commit into from
May 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/11.nix
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ let

disallowedReferences = [ openjdk11-bootstrap ];

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;

passthru = {
architecture = "";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/12.nix
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ let

disallowedReferences = [ openjdk11 ];

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;

passthru = {
architecture = "";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/13.nix
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ let

disallowedReferences = [ openjdk13-bootstrap ];

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;

passthru = {
architecture = "";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/14.nix
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ let

disallowedReferences = [ openjdk14-bootstrap ];

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;

passthru = {
architecture = "";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/15.nix
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ let

disallowedReferences = [ openjdk15-bootstrap ];

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;

passthru = {
architecture = "";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/16.nix
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ let

disallowedReferences = [ openjdk16-bootstrap ];

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version.feature;

passthru = {
architecture = "";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/17.nix
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ let

disallowedReferences = [ openjdk17-bootstrap ];

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version.feature;

passthru = {
architecture = "";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/darwin/11.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ let
home = jdk;
};

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/darwin/16.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ let
home = jdk;
};

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/darwin/17.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ let
home = jdk;
};

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/darwin/8.nix
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ let
home = jdk;
};

meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk
2 changes: 1 addition & 1 deletion pkgs/development/compilers/openjdk/darwin/meta.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // {
lib: version: (removeAttrs (import ../meta.nix lib version) [ "maintainers" ]) // {
platforms = lib.platforms.darwin;
homepage = "https://www.azul.com/";
}
5 changes: 4 additions & 1 deletion pkgs/development/compilers/openjdk/meta.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
lib: with lib; {
lib: version: with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2Only;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo asbachb ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" ]) [
"This OpenJDK version has reached its end of life."
];
}