From cecba69ff814626cdfeba0a9a88c7ad61e35d7ca Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Fri, 14 Nov 2025 14:23:24 -0500
Subject: 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.
---
 Omni/Bild.hs  | 2 +-
 Omni/Bild.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'Omni')

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
         ];
-- 
cgit v1.2.3