From 1c28bb3b90eddcc1c93b91be8fbb8b727ba00e02 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 17 May 2020 22:23:27 +0200 Subject: [PATCH] Improve Testscript output --- lib/test.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/test.nix b/lib/test.nix index 6c060f2a..7def0820 100644 --- a/lib/test.nix +++ b/lib/test.nix @@ -7,13 +7,17 @@ in rec { (configDir:hostname:args) <- getArgs paths <- myNixPath $ toText configDir say [i|Trying to build ${name} config for #{hostname}|] + hFlush stdout ${commandline} + say [i|Build of ${name} config for #{hostname} was successful.|] ''; bins = [ pkgs.nix ]; + imports = [ "System.IO (hFlush)" ]; test-system-config = writeHaskellScript { name = "test-system-config"; inherit bins; + inherit imports; } (haskellBody "system" '' nix_build $ ["", "-A", "system"] ++ paths ++ ["-I", [i|nixos-config=#{configDir}/hosts/#{hostname}/configuration.nix|], "-o", [i|result-system-#{hostname}|]] ++ fmap toString args ''); @@ -21,6 +25,7 @@ in rec { test-home-config = writeHaskellScript { name = "test-home-config"; inherit bins; + inherit imports; } (haskellBody "home" '' nix_build $ paths ++ [ [i|#{configDir}/home/target.nix|], "-A", hostname, "-o", [i|result-home-manager-#{hostname}|]] ++ fmap toString args '');