From d267b1e3b3167d35fd50ff0979dab4a7639a8dc1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 22 Dec 2025 11:03:12 +0100 Subject: [PATCH] nix.tests.srcVersion: Tolerate patch versions --- pkgs/tools/package-management/nix/tests.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/tests.nix b/pkgs/tools/package-management/nix/tests.nix index 5a7e9c245c863..34c9c7fca22b5 100644 --- a/pkgs/tools/package-management/nix/tests.nix +++ b/pkgs/tools/package-management/nix/tests.nix @@ -36,9 +36,12 @@ fi '' else - # exact match + # Match base version, ignoring +suffix (which comes from patches) '' - if [ "$version" != "$srcVersion" ]; then + stripSuffix() { + echo "$1" | sed 's/+.*//' + } + if [ "$(stripSuffix "$version")" != "$(stripSuffix "$srcVersion")" ]; then echo "Version mismatch!" exit 1 fi