summaryrefslogtreecommitdiff
path: root/Omni
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2025-11-14 14:23:24 -0500
committerBen Sima <ben@bsima.me>2025-11-14 14:23:24 -0500
commitcecba69ff814626cdfeba0a9a88c7ad61e35d7ca (patch)
tree158989b944a3c5ff3b20000298027a57383e5546 /Omni
parent0ac4c89ccef75b5c66b5de8a005c35bc6b30fdb7 (diff)
Add ansi-terminal dep and Omni/Log/Concurrent to Bild.nix
- Add ansi-terminal to ghcPackageSetBild dependencies - Add Omni/Log/Concurrent.hs to source fileset - Fix unused mLineNum warning in buildTarget - Alphabetize deps list (hostname moved up) Parallel builds now fully functional with proper Nix dependencies.
Diffstat (limited to 'Omni')
-rwxr-xr-xOmni/Bild.hs2
-rw-r--r--Omni/Bild.nix4
2 files changed, 4 insertions, 2 deletions
diff --git a/Omni/Bild.hs b/Omni/Bild.hs
index e1aaced..1b08f17 100755
--- a/Omni/Bild.hs
+++ b/Omni/Bild.hs
@@ -961,7 +961,7 @@ build andTest loud jobs cpus analysis = do
where
buildTarget :: LogC.LineManager -> FilePath -> Target -> IO (Exit.ExitCode, ByteString)
buildTarget lineMgr root target@Target {..} = do
- mLineNum <- LogC.reserveLine lineMgr namespace
+ _ <- LogC.reserveLine lineMgr namespace
result <- case compiler of
CPython -> case out of
Just _ ->
diff --git a/Omni/Bild.nix b/Omni/Bild.nix
index a06805c..adacb97 100644
--- a/Omni/Bild.nix
+++ b/Omni/Bild.nix
@@ -68,6 +68,7 @@
ghcPackageSetBild = ghcWith (hpkgs:
with hpkgs; [
aeson
+ ansi-terminal
async
base
bytestring
@@ -77,6 +78,7 @@
directory
docopt
filepath
+ hostname
process
protolude
rainbow
@@ -86,7 +88,6 @@
tasty-hunit
tasty-quickcheck
text
- hostname
wai # can remove when removed from Omni.Log
]);
};
@@ -161,6 +162,7 @@
../Omni/Bild/Meta.hs
../Omni/Cli.hs
../Omni/Log.hs
+ ../Omni/Log/Concurrent.hs
../Omni/Namespace.hs
../Omni/Test.hs
];