testers.testEqualArrayOrMap: inline let expression

NixOS · Feb 27, 2025 · a527799 · a527799
1 parent 5b5c499
commit a527799
Showing 1 changed file with 29 additions and 35 deletions.
diff --git a/pkgs/build-support/testers/testEqualArrayOrMap/default.nix b/pkgs/build-support/testers/testEqualArrayOrMap/default.nix
@@ -2,45 +2,39 @@
   lib,
   stdenvNoCC,
 }:
-let
-  inherit (lib) maintainers;
-  inherit (lib.asserts) assertMsg;
-  inherit (lib.customisation) makeOverridable;
+lib.makeOverridable (
+  {
+    name,
+    valuesArray ? null,
+    valuesMap ? null,
+    expectedArray ? null,
+    expectedMap ? null,
+    script,
+  }:
+  assert lib.assertMsg (
+    expectedArray != null || expectedMap != null
+  ) "testEqualArrayOrMap: at least one of 'expectedArray' or 'expectedMap' must be provided";
+  stdenvNoCC.mkDerivation {
+    __structuredAttrs = true;
+    strictDeps = true;
 
-  testEqualArrayOrMap =
-    {
-      name,
-      valuesArray ? null,
-      valuesMap ? null,
-      expectedArray ? null,
-      expectedMap ? null,
-      script,
-    }:
-    assert assertMsg (
-      expectedArray != null || expectedMap != null
-    ) "testEqualArrayOrMap: at least one of 'expectedArray' or 'expectedMap' must be provided";
-    stdenvNoCC.mkDerivation {
-      __structuredAttrs = true;
-      strictDeps = true;
+    inherit name;
 
-      inherit name;
+    nativeBuildInputs = [
+      ./assert-equal-array.sh
+      ./assert-equal-map.sh
+    ];
 
-      nativeBuildInputs = [
-        ./assert-equal-array.sh
-        ./assert-equal-map.sh
-      ];
+    inherit valuesArray valuesMap;
+    inherit expectedArray expectedMap;
 
-      inherit valuesArray valuesMap;
-      inherit expectedArray expectedMap;
+    inherit script;
 
-      inherit script;
+    buildCommandPath = ./build-command.sh;
 
-      buildCommandPath = ./build-command.sh;
-
-      meta = {
-        description = "Tests for equality of bash arrays (including associative arrays)";
-        maintainers = [ maintainers.connorbaker ];
-      };
+    meta = {
+      description = "Tests for equality of bash arrays (including associative arrays)";
+      maintainers = [ lib.maintainers.connorbaker ];
     };
-in
-makeOverridable testEqualArrayOrMap
+  }
+)