ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 13:48:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #311069 from nbraud/fix-307770

Browse Source 
testers.hasPkgConfigModules: fix bug in `versionCheck` handling
This commit is contained in:
Robert Hensing 2024-05-21 00:13:09 +02:00 committed by GitHub
commit 28df2298ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/testers/hasPkgConfigModules/tester.nix
View File

@ -45,7 +45,7 @@ runCommand testName {
if [[ "$moduleVersion" == "$version" ]]; then if [[ "$moduleVersion" == "$version" ]]; then
echo "✅ pkg-config module $moduleName exists and has version $moduleVersion" echo "✅ pkg-config module $moduleName exists and has version $moduleVersion"
else else
echo "❌ pkg-config module $moduleName exists and has version $moduleVersion when $version was expected" echo "${if versionCheck then "❌" else "ℹ️"} pkg-config module $moduleName exists at version $moduleVersion != $version (drv version)"
((versionMismatch+=1)) ((versionMismatch+=1))
fi fi
printf '%s\t%s\n' "$moduleName" "$version" >> "$out" printf '%s\t%s\n' "$moduleName" "$version" >> "$out"
@ -55,7 +55,7 @@ runCommand testName {
fi fi
done done
if [[ $notFound -eq 0 ]] && ([[ $versionMismatch -eq 0 ]] || [[ "$versionCheck" == false ]]); then if [[ $notFound -eq 0 ]] && ([[ $versionMismatch -eq 0 ]] || [[ -z "$versionCheck" ]]); then
exit 0 exit 0
fi fi
if [[ $notFound -ne 0 ]]; then if [[ $notFound -ne 0 ]]; then

7
pkgs/build-support/testers/hasPkgConfigModules/tests.nix
View File

@ -11,10 +11,15 @@ lib.recurseIntoAttrs {
miniz-versions-mismatch = testers.testBuildFailure (testers.hasPkgConfigModules { miniz-versions-mismatch = testers.testBuildFailure (testers.hasPkgConfigModules {
package = miniz; package = miniz;
version = "1.2.3"; version = "1.2.3"; # Deliberately-incorrect version number
versionCheck = true; versionCheck = true;
}); });
miniz-no-versionCheck = testers.hasPkgConfigModules {
package = miniz;
version = "1.2.3"; # Deliberately-incorrect version number
};
zlib-has-zlib = testers.hasPkgConfigModules { zlib-has-zlib = testers.hasPkgConfigModules {
package = zlib; package = zlib;
moduleNames = [ "zlib" ]; moduleNames = [ "zlib" ];