pyrox.dev
openjdk{8,11,17,21,23}: remove obsolete version logic
+2
-6
pkgs/development/compilers/openjdk/generic.nix
+2
-6
pkgs/development/compilers/openjdk/generic.nix
···
99
99
atLeast23 = lib.versionAtLeast featureVersion "23";
100
100
101
101
tagPrefix = if atLeast11 then "jdk-" else "jdk";
102
-
# TODO: Merge these `lib.removePrefix` calls once update scripts have
103
-
# been run.
104
-
version = lib.removePrefix tagPrefix (lib.removePrefix "refs/tags/" source.src.rev);
105
-
versionSplit =
106
-
# TODO: Remove `-ga` logic once update scripts have been run.
107
-
builtins.match (if atLeast11 then "(.+)[-+](.+)" else "(.+)-b?(.+)") version;
102
+
version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev;
103
+
versionSplit = builtins.match (if atLeast11 then "(.+)+(.+)" else "(.+)-b(.+)") version;
108
104
versionBuild = lib.elemAt versionSplit 1;
109
105
110
106
# The JRE 8 libraries are in directories that depend on the CPU.