From dede7feaa7730c8b43d0f06fd295b865da9a1e6a Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 05:06:05 -0500 Subject: [PATCH] openjdk: 16+36 -> 16.0.2-ga Build number is set to 1, as this was the last release and thus had no build number. Additionally, this update is made despite the fact that the package is marked as insecure, to pull in the small number of accumulated fixes. --- pkgs/development/compilers/openjdk/16.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 4b0874a03a41..12ba5c9c16db 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -11,8 +11,8 @@ let version = { feature = "16"; - interim = "0"; - build = "36"; + interim = ".0.2-ga"; + build = "1"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -20,13 +20,14 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}+${version.build}"; + version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}+${version.build}"; - sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44"; + rev = "jdk-${version.feature}${version.interim}"; + # rev = "jdk-${version.feature}${version.interim}+${version.build}"; + sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU="; }; nativeBuildInputs = [ pkg-config autoconf unzip ];