on master help sign in
Merge pull request #693 from obsidiansystems/ts-hide-attr-cache
a02f5eaElliot Cameron
lib/command/src/Obelisk/Command/Run.hs+2−2
@@ -64,7 +64,7 @@ import Obelisk.CliApp (
64 withSpinner,
64 withSpinner,
65 )
65 )
66import Obelisk.Command.Nix
66import Obelisk.Command.Nix
67−import Obelisk.Command.Project (nixShellWithPkgs, toImplDir, withProjectRoot, findProjectAssets)
67+import Obelisk.Command.Project (nixShellWithPkgs, withProjectRoot, findProjectAssets)
68import Obelisk.Command.Thunk (attrCacheFileName)
68import Obelisk.Command.Thunk (attrCacheFileName)
69import Obelisk.Command.Utils (findExePath, ghcidExePath)
69import Obelisk.Command.Utils (findExePath, ghcidExePath)
70
70
@@ -164,7 +164,7 @@ getLocalPkgs root = do
164 let exclusions = filter (/= root) $ map takeDirectory obeliskPaths
164 let exclusions = filter (/= root) $ map takeDirectory obeliskPaths
165 fmap (map (makeRelative ".")) $ runFind $
165 fmap (map (makeRelative ".")) $ runFind $
166 ["-L", root, "(", "-name", "*.cabal", "-o", "-name", Hpack.packageConfig, ")", "-a", "-type", "f"]
166 ["-L", root, "(", "-name", "*.cabal", "-o", "-name", Hpack.packageConfig, ")", "-a", "-type", "f"]
167− <> concat [["-not", "-path", p </> "*"] | p <- (toImplDir "*" </> attrCacheFileName) : exclusions]
167+ <> concat [["-not", "-path", p </> "*"] | p <- ("*" </> attrCacheFileName) : exclusions]
168 where
168 where
169 runFind args = do
169 runFind args = do
170 (_exitCode, out, err) <- readCreateProcessWithExitCode $ proc findExePath args
170 (_exitCode, out, err) <- readCreateProcessWithExitCode $ proc findExePath args