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

Merge pull request #116935 from hercules-ci/unsupported-jdks

Browse Source 
adoptopenjdk-bin: mark insecure 13 and 14
This commit is contained in:
taku0 2021-03-21 16:45:47 +09:00 committed by GitHub
commit aaa9453327
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
View File

@ -1,4 +1,4 @@
sourcePerArch: { sourcePerArch, knownVulnerabilities ? [] }:
{ swingSupport ? true # not used for now { swingSupport ? true # not used for now
, lib, stdenv , lib, stdenv
@ -48,6 +48,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
description = "AdoptOpenJDK, prebuilt OpenJDK binary"; description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ]; maintainers = with lib.maintainers; [ taku0 ];
inherit knownVulnerabilities;
}; };
}; in result }; in result

3
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View File

@ -1,4 +1,4 @@
sourcePerArch: { sourcePerArch, knownVulnerabilities ? [] }:
{ stdenv { stdenv
, lib , lib
@ -107,6 +107,7 @@ let result = stdenv.mkDerivation rec {
description = "AdoptOpenJDK, prebuilt OpenJDK binary"; description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ]; maintainers = with lib.maintainers; [ taku0 ];
inherit knownVulnerabilities;
}; };
}; in result }; in result

8
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot; jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9; jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9; jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.openj9; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.openj9; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.hotspot; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.hotspot; jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.openj9; jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.openj9; jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.hotspot; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.hotspot; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.openj9; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.openj9; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.hotspot; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.hotspot; jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.openj9; jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.openj9; jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.hotspot; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.hotspot; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.openj9; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.openj9; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.hotspot; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.hotspot; jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.openj9; jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.openj9; jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.hotspot; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.hotspot; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.openj9; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.openj9; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.openj9; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot; jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9; jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9; jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.openj9; };
} }

8
pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.openj9; };
} }