From f3386d689baa63bb83f95b32d19d7b649e34c6a8 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 26 Jul 2019 01:35:19 +0200 Subject: [PATCH] Small tests.nix improvements --- home-manager/tests.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home-manager/tests.nix b/home-manager/tests.nix index e8377956..4e848939 100644 --- a/home-manager/tests.nix +++ b/home-manager/tests.nix @@ -50,8 +50,7 @@ let bump-config = writeHaskellScript { name = "bump-config"; bins = [ test-system-config test-home-manager-config pkgs.git pkgs.coreutils niv pkgs.git-crypt ]; - imports = ["System.Console.CmdArgs.Implicit" "Control.Exception" "System.Directory (withCurrentDirectory)" "Control.Monad (when)"]; - libraries = [ unstable.haskellPackages.cmdargs ]; + imports = [ "Control.Exception (bracket)" "System.Directory (withCurrentDirectory)" "Control.Monad (when)"]; } '' main = do path <- readTrim pwd @@ -59,7 +58,7 @@ let dir <- (LT.unpack . LTE.decodeUtf8 <$>) . readTrim $ mktemp "-d" git "clone" "${repoSrc}" dir return dir) - (\dir -> rm "-rf" dir) $ + (rm "-rf") $ \dir -> do withCurrentDirectory dir $ git_crypt "unlock" >> niv "update" mapM_ (test_system_config dir) ["apollo", "hera"]