pyrox.dev
Merge pull request #311069 from nbraud/fix-307770
testers.hasPkgConfigModules: fix bug in `versionCheck` handling
authored by Robert Hensing and committed by GitHub 28df2298 165f2b48
+2
-2
pkgs/build-support/testers/hasPkgConfigModules/tester.nix
+2
-2
pkgs/build-support/testers/hasPkgConfigModules/tester.nix
···
45
45
if [[ "$moduleVersion" == "$version" ]]; then
46
46
echo "✅ pkg-config module $moduleName exists and has version $moduleVersion"
47
47
else
48
-
echo "❌ pkg-config module $moduleName exists and has version $moduleVersion when $version was expected"
48
+
echo "${if versionCheck then "❌" else "ℹ️"} pkg-config module $moduleName exists at version $moduleVersion != $version (drv version)"
49
49
((versionMismatch+=1))
50
50
fi
51
51
printf '%s\t%s\n' "$moduleName" "$version" >> "$out"
···
55
55
fi
56
56
done
57
57
58
-
if [[ $notFound -eq 0 ]] && ([[ $versionMismatch -eq 0 ]] || [[ "$versionCheck" == false ]]); then
58
+
if [[ $notFound -eq 0 ]] && ([[ $versionMismatch -eq 0 ]] || [[ -z "$versionCheck" ]]); then
59
59
exit 0
60
60
fi
61
61
if [[ $notFound -ne 0 ]]; then
+6
-1
pkgs/build-support/testers/hasPkgConfigModules/tests.nix
+6
-1
pkgs/build-support/testers/hasPkgConfigModules/tests.nix
···
11
11
12
12
miniz-versions-mismatch = testers.testBuildFailure (testers.hasPkgConfigModules {
13
13
package = miniz;
14
-
version = "1.2.3";
14
+
version = "1.2.3"; # Deliberately-incorrect version number
15
15
versionCheck = true;
16
16
});
17
+
18
+
miniz-no-versionCheck = testers.hasPkgConfigModules {
19
+
package = miniz;
20
+
version = "1.2.3"; # Deliberately-incorrect version number
21
+
};
17
22
18
23
zlib-has-zlib = testers.hasPkgConfigModules {
19
24
package = zlib;