git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix issue with testWrapper (exposed by #238) (#243)
f5b80ecHamish Mackenzie
builder/comp-builder.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -197,7 +197,7 @@ stdenv.mkDerivation ({
197 checkPhase = ''
197 checkPhase = ''
198 runHook preCheck
198 runHook preCheck
199
199
200− ${component.testWrapper} ${testExecutable} ${lib.concatStringsSep " " component.testFlags}
200+ ${toString component.testWrapper} ${testExecutable} ${lib.concatStringsSep " " component.testFlags}
201
201
202 runHook postCheck
202 runHook postCheck
203 '';
203 '';
modules/plan.nix+4−2
@@ -130,8 +130,10 @@ let
130 };
130 };
131 # Wrapper for test executable run in checkPhase
131 # Wrapper for test executable run in checkPhase
132 testWrapper = mkOption {
132 testWrapper = mkOption {
133− type = str;
133+ type = nullOr str;
134− default = (def.testWrapper or "");
134+ default = def.testWrapper or null;
135+ description = "A command to run for executing tests in checkPhase, which takes the original test command as its arguments.";
136+ example = "echo";
135 };
137 };
136 postCheck = mkOption {
138 postCheck = mkOption {
137 type = nullOr str;
139 type = nullOr str;