From dacd54d3f71303bffad8002084d2e117d8321464 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 Apr 2022 01:00:57 +0200 Subject: [PATCH] openjdk: mark major version 12 through 16 as EOL https://endoflife.date/java https://www.azul.com/products/azul-support-roadmap/ Related: #170825 --- pkgs/development/compilers/openjdk/11.nix | 2 +- pkgs/development/compilers/openjdk/12.nix | 2 +- pkgs/development/compilers/openjdk/13.nix | 2 +- pkgs/development/compilers/openjdk/14.nix | 2 +- pkgs/development/compilers/openjdk/15.nix | 2 +- pkgs/development/compilers/openjdk/16.nix | 2 +- pkgs/development/compilers/openjdk/17.nix | 2 +- pkgs/development/compilers/openjdk/darwin/11.nix | 2 +- pkgs/development/compilers/openjdk/darwin/16.nix | 2 +- pkgs/development/compilers/openjdk/darwin/17.nix | 2 +- pkgs/development/compilers/openjdk/darwin/8.nix | 2 +- pkgs/development/compilers/openjdk/darwin/meta.nix | 2 +- pkgs/development/compilers/openjdk/meta.nix | 5 ++++- 13 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 1a74a78fc6c..0dc085d032b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 8f2b6d40546..addaa13270d 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -151,7 +151,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 7fb1c35cf9f..37ff9983378 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -151,7 +151,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 29a5c3cc5c3..d4e88f278cd 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 987d018cdf3..e692de71a10 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 0a4a8e1de41..3e9ae98f366 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -154,7 +154,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index de12711894f..45acc7f1ce9 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -157,7 +157,7 @@ let disallowedReferences = [ openjdk17-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index d8c1bb6bf25..1ca2901b048 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -86,7 +86,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/16.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index d491d75322f..b8f6b2d62ad 100644 --- a/pkgs/development/compilers/openjdk/darwin/16.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix @@ -86,7 +86,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix index 98e6fc6216e..2720a887565 100644 --- a/pkgs/development/compilers/openjdk/darwin/17.nix +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -75,7 +75,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index aeb60d8bc46..3048c53f10f 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -90,7 +90,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/meta.nix b/pkgs/development/compilers/openjdk/darwin/meta.nix index abe469af691..f07a7f38a45 100644 --- a/pkgs/development/compilers/openjdk/darwin/meta.nix +++ b/pkgs/development/compilers/openjdk/darwin/meta.nix @@ -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/"; } diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index d635d5c01e6..c66ecc29cf5 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -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." + ]; }