Use pass thru.tests.version not custom installCheckPhase script

Co-authored-by: Tom van Dijk <18gatenmaker6@gmail.com>
This commit is contained in:
Sean Gilligan
2025-07-02 14:40:39 -07:00
committed by GitHub
co-authored by Tom van Dijk
parent 02f7ac63c0
commit 9ded46560d
+5 -12
View File
@@ -141,18 +141,11 @@ let
fi
'';
doInstallCheck = true;
installCheckPhase = ''
echo "Checking 'java -version' output contains ${dist.jdkVersion}, 'OpenJDK', and 'Zulu'"
output=`$out/bin/java -version 2>&1`
# Our Zulu 23 package is a special case (and should be deleted as it is End-of-Life)
expected_version=$(if [[ "${dist.jdkVersion}" == 23* ]]; then echo 23; else echo "${dist.jdkVersion}"; fi)
echo "Output is: $output"
echo "$output" | grep -q "$expected_version"
echo "$output" | grep -q "OpenJDK"
echo "$output" | grep -q "Zulu"
'';
passthru.tests.version = testers.testVersion {
package = jdk;
command = "java -version";
version = ''openjdk version "${if lib.versions.major version == "23" then "23" else version}"'';
};
preFixup =
''
# Propagate the setJavaClassPath setup hook from the ${if isJdk8 then "JRE" else "JDK"} so that