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

Merge pull request #314380 from Infinidoge/bump-openjdk-jdkjfx

Browse Source 
jdk: misc cleanup
This commit is contained in:
Thiago Kenji Okada
2024-05-25 12:07:25 +01:00
committed by GitHub
parent b54bf318d3 ccbada92bb
commit fde6301077
13 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
+4 -4
View File
@@ -4,8 +4,8 @@ let
sources = lib.importJSON ./sources.json;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; };
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
}
pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
+4 -4
View File
@@ -5,8 +5,8 @@ let
sources = lib.importJSON ./sources.json;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; };
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
}
pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
+4 -4
View File
@@ -4,8 +4,8 @@ let
sources = lib.importJSON ./sources.json;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; };
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
}
pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
+4 -4
View File
@@ -5,8 +5,8 @@ let
sources = lib.importJSON ./sources.json;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; };
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
}
pkgs/development/compilers/corretto/11.nix
+1 -2
View File
@@ -1,5 +1,4 @@
{ corretto11
, fetchFromGitHub
{ fetchFromGitHub
, gradle_7
, jdk11
, lib
pkgs/development/compilers/corretto/17.nix
+1 -2
View File
@@ -1,5 +1,4 @@
{ corretto17
, fetchFromGitHub
{ fetchFromGitHub
, gradle_7
, jdk17
, lib
pkgs/development/compilers/corretto/19.nix
+3 -4
View File
@@ -1,5 +1,4 @@
{ corretto19
, fetchFromGitHub
{ fetchFromGitHub
, gradle_7
, jdk19
, lib
@@ -10,7 +9,7 @@
}:
let
corretto = import ./mk-corretto.nix {
corretto = import ./mk-corretto.nix rec {
inherit lib stdenv rsync runCommand testers;
jdk = jdk19;
gradle = gradle_7;
@@ -18,7 +17,7 @@ let
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-19";
rev = "72f064a1d716272bd17d4e425d4a264b2c2c7d36";
rev = version;
sha256 = "sha256-mEj/MIbdXU0+fF5RhqjPuSeyclstesGaXB0e48YlKuw=";
};
};
pkgs/development/compilers/corretto/21.nix
+2 -2
View File
@@ -10,7 +10,7 @@
}:
let
corretto = import ./mk-corretto.nix {
corretto = import ./mk-corretto.nix rec {
inherit lib stdenv rsync runCommand testers;
jdk = jdk21;
gradle = gradle_7;
@@ -18,7 +18,7 @@ let
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-21";
rev = "97b366227b4dc8f5a89bbedea88b0b18c9e21886";
rev = version;
sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0=";
};
};
pkgs/development/compilers/openjdk/meta.nix
+2 -2
View File
@@ -2,10 +2,10 @@ lib: version: with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2Only;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
maintainers = with maintainers; [ edwtjo infinidoge ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ];
mainProgram = "java";
knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" ]) [
knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" "19" "20" ]) [
"This OpenJDK version has reached its end of life."
];
}
pkgs/development/compilers/openjdk/openjfx/19.nix
+3
View File
@@ -141,5 +141,8 @@ in makePackage {
description = "The next-generation Java client toolkit";
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;
knownVulnerabilities = [
"This OpenJFX version has reached its end of life."
];
};
}
pkgs/development/compilers/openjdk/openjfx/20.nix
+7 -4
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, openjdk20_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
, withMedia ? true
, withWebKit ? false
@@ -49,7 +49,7 @@ let
config = writeText "gradle.properties" (''
CONF = Release
JDK_HOME = ${openjdk19_headless.home}
JDK_HOME = ${openjdk20_headless.home}
'' + args.gradleProperties or "");
buildPhase = ''
@@ -111,14 +111,14 @@ in makePackage {
postFixup = ''
# Remove references to bootstrap.
export openjdkOutPath='${openjdk19_headless.outPath}'
export openjdkOutPath='${openjdk20_headless.outPath}'
find "$out" -name \*.so | while read lib; do
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
'';
disallowedReferences = [ openjdk17_headless openjdk19_headless ];
disallowedReferences = [ openjdk17_headless openjdk20_headless ];
passthru.deps = deps;
@@ -128,5 +128,8 @@ in makePackage {
description = "The next-generation Java client toolkit";
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;
knownVulnerabilities = [
"This OpenJFX version has reached its end of life."
];
};
}
pkgs/development/compilers/openjdk/openjfx/21.nix
+4 -4
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
, withMedia ? true
, withWebKit ? false
@@ -49,7 +49,7 @@ let
config = writeText "gradle.properties" (''
CONF = Release
JDK_HOME = ${openjdk19_headless.home}
JDK_HOME = ${openjdk21_headless.home}
'' + args.gradleProperties or "");
buildPhase = ''
@@ -111,14 +111,14 @@ in makePackage {
postFixup = ''
# Remove references to bootstrap.
export openjdkOutPath='${openjdk19_headless.outPath}'
export openjdkOutPath='${openjdk21_headless.outPath}'
find "$out" -name \*.so | while read lib; do
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
'';
disallowedReferences = [ openjdk17_headless openjdk19_headless ];
disallowedReferences = [ openjdk17_headless openjdk21_headless ];
passthru.deps = deps;
pkgs/top-level/all-packages.nix
-2
View File
@@ -16094,8 +16094,6 @@ with pkgs;
jdk17 = openjdk17;
jdk17_headless = openjdk17_headless;
openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap;
openjdk19 = javaPackages.compiler.openjdk19;
openjdk19_headless = javaPackages.compiler.openjdk19.headless;
jdk19 = openjdk19;