From 9ded46560d8919f9b5d42b9b5df29169bfddc07b Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Wed, 2 Jul 2025 14:40:39 -0700 Subject: [PATCH] Use pass thru.tests.version not custom installCheckPhase script Co-authored-by: Tom van Dijk <18gatenmaker6@gmail.com> --- pkgs/development/compilers/zulu/common.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index 32299b402c20..60b090c1f2f9 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -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