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

openjdk{8,11,17,21,23}: remove obsolete version logic

Browse Source
This commit is contained in:
Emily 2024-10-24 18:49:28 +01:00
parent 860924d704
commit 7bc545f5a8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/openjdk/generic.nix
View File

@ -99,12 +99,8 @@ let
atLeast23 = lib.versionAtLeast featureVersion "23";
tagPrefix = if atLeast11 then "jdk-" else "jdk";
# TODO: Merge these `lib.removePrefix` calls once update scripts have
# been run.
version = lib.removePrefix tagPrefix (lib.removePrefix "refs/tags/" source.src.rev);
versionSplit =
# TODO: Remove `-ga` logic once update scripts have been run.
builtins.match (if atLeast11 then "(.+)[-+](.+)" else "(.+)-b?(.+)") version;
version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev;
versionSplit = builtins.match (if atLeast11 then "(.+)+(.+)" else "(.+)-b(.+)") version;
versionBuild = lib.elemAt versionSplit 1;
# The JRE 8 libraries are in directories that depend on the CPU.