Skip to content

Commit b2bb494

Browse files
committed
testers.testEqualArrayOrMap: inline let expression
1 parent 12ffaa4 commit b2bb494

File tree

1 file changed

+26
-31
lines changed
  • pkgs/build-support/testers/testEqualArrayOrMap

1 file changed

+26
-31
lines changed

pkgs/build-support/testers/testEqualArrayOrMap/default.nix

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,34 @@
22
lib,
33
stdenvNoCC,
44
}:
5-
let
6-
inherit (lib.asserts) assertMsg;
7-
inherit (lib.customisation) makeOverridable;
5+
lib.makeOverridable (
6+
{
7+
name,
8+
valuesArray ? null,
9+
valuesMap ? null,
10+
expectedArray ? null,
11+
expectedMap ? null,
12+
script,
13+
}:
14+
assert lib.assertMsg (
15+
expectedArray != null || expectedMap != null
16+
) "testEqualArrayOrMap: at least one of 'expectedArray' or 'expectedMap' must be provided";
17+
stdenvNoCC.mkDerivation {
18+
__structuredAttrs = true;
19+
strictDeps = true;
820

9-
testEqualArrayOrMap =
10-
{
11-
name,
12-
valuesArray ? null,
13-
valuesMap ? null,
14-
expectedArray ? null,
15-
expectedMap ? null,
16-
script,
17-
}:
18-
assert assertMsg (
19-
expectedArray != null || expectedMap != null
20-
) "testEqualArrayOrMap: at least one of 'expectedArray' or 'expectedMap' must be provided";
21-
stdenvNoCC.mkDerivation {
22-
__structuredAttrs = true;
23-
strictDeps = true;
21+
inherit name;
2422

25-
inherit name;
23+
nativeBuildInputs = [
24+
./assert-equal-array.sh
25+
./assert-equal-map.sh
26+
];
2627

27-
nativeBuildInputs = [
28-
./assert-equal-array.sh
29-
./assert-equal-map.sh
30-
];
28+
inherit valuesArray valuesMap;
29+
inherit expectedArray expectedMap;
3130

32-
inherit valuesArray valuesMap;
33-
inherit expectedArray expectedMap;
31+
inherit script;
3432

35-
inherit script;
36-
37-
buildCommandPath = ./build-command.sh;
38-
};
39-
in
40-
makeOverridable testEqualArrayOrMap
33+
buildCommandPath = ./build-command.sh;
34+
}
35+
)

0 commit comments

Comments
 (0)