From 40019a5e1477950340f37148ac7e8a3308245d18 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 25 Feb 2025 22:41:28 +0000
Subject: [PATCH] testers.testEqualArrayOrMap: unwrap namerefs before passing
 to avoid nesting

---
 .../testers/testEqualArrayOrMap/assert-equal-array.sh         | 4 ++--
 .../testers/testEqualArrayOrMap/assert-equal-map.sh           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh
index 92fa981e44ee..ef43dedba625 100644
--- a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh
+++ b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh
@@ -18,12 +18,12 @@ assertEqualArray() {
   local -nr expectedArrayRef="$1"
   local -nr actualArrayRef="$2"
 
-  if ! isDeclaredArray expectedArrayRef; then
+  if ! isDeclaredArray "${!expectedArrayRef}"; then
     nixErrorLog "first arugment expectedArrayRef must be an array reference to a declared array"
     exit 1
   fi
 
-  if ! isDeclaredArray actualArrayRef; then
+  if ! isDeclaredArray "${!actualArrayRef}"; then
     nixErrorLog "second arugment actualArrayRef must be an array reference to a declared array"
     exit 1
   fi
diff --git a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh
index f66fab4f8468..b601f9e424e9 100644
--- a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh
+++ b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh
@@ -18,12 +18,12 @@ assertEqualMap() {
   local -nr expectedMapRef="$1"
   local -nr actualMapRef="$2"
 
-  if ! isDeclaredMap expectedMapRef; then
+  if ! isDeclaredMap "${!expectedMapRef}"; then
     nixErrorLog "first arugment expectedMapRef must be an associative array reference to a declared associative array"
     exit 1
   fi
 
-  if ! isDeclaredMap actualMapRef; then
+  if ! isDeclaredMap "${!actualMapRef}"; then
     nixErrorLog "second arugment actualMapRef must be an associative array reference to a declared associative array"
     exit 1
   fi