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.
---
 .tasks/tasks.jsonl | 2 +-
 Omni/Bild.hs       | 2 +-
 Omni/Bild.nix      | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.tasks/tasks.jsonl b/.tasks/tasks.jsonl
index ee7a6ec..0c1c36c 100644
--- a/.tasks/tasks.jsonl
+++ b/.tasks/tasks.jsonl
@@ -68,7 +68,7 @@
 {"taskCreatedAt":"2025-11-13T19:54:08.34625259Z","taskDependencies":[],"taskId":"t-1gcR9RV","taskNamespace":"Omni/Bild.nix","taskParent":null,"taskStatus":"Open","taskTitle":"Add ruff to the developer environment, the 'env' attribute in Bild.nix","taskType":"WorkTask","taskUpdatedAt":"2025-11-13T19:54:08.34625259Z"}
 {"taskCreatedAt":"2025-11-13T20:02:50.914482516Z","taskDependencies":[],"taskId":"t-1gMdNJK","taskNamespace":null,"taskParent":"t-1f9QP23","taskStatus":"Done","taskTitle":"Fix dev mode banner styling and pre-fill login email","taskType":"WorkTask","taskUpdatedAt":"2025-11-13T20:03:45.644107089Z"}
 {"taskCreatedAt":"2025-11-13T21:01:35.331063546Z","taskDependencies":[{"depId":"t-1fbG02X","depType":"DiscoveredFrom"}],"taskId":"t-1kCJTuu","taskNamespace":null,"taskParent":null,"taskStatus":"Done","taskTitle":"Fix Stripe portal error handling and account page padding","taskType":"WorkTask","taskUpdatedAt":"2025-11-13T21:03:19.701792229Z"}
-{"taskCreatedAt":"2025-11-14T18:19:16.584321849Z","taskDependencies":[],"taskId":"t-19ZF6A8","taskNamespace":null,"taskParent":null,"taskStatus":"Open","taskTitle":"Parallel Target Builds - Epic","taskType":"Epic","taskUpdatedAt":"2025-11-14T18:19:16.584321849Z"}
+{"taskCreatedAt":"2025-11-14T18:19:16.584321849Z","taskDependencies":[],"taskId":"t-19ZF6A8","taskNamespace":null,"taskParent":null,"taskStatus":"Done","taskTitle":"Parallel Target Builds - Epic","taskType":"Epic","taskUpdatedAt":"2025-11-14T19:03:02.525200039Z"}
 {"taskCreatedAt":"2025-11-14T18:19:33.701736325Z","taskDependencies":[],"taskId":"t-1a0OVBs","taskNamespace":null,"taskParent":"t-19ZF6A8","taskStatus":"Done","taskTitle":"Add mapConcurrentlyBounded helper using QSemN","taskType":"WorkTask","taskUpdatedAt":"2025-11-14T18:20:20.979870628Z"}
 {"taskCreatedAt":"2025-11-14T18:19:37.810028305Z","taskDependencies":[],"taskId":"t-1a16ame","taskNamespace":null,"taskParent":"t-19ZF6A8","taskStatus":"Done","taskTitle":"Refactor build function to extract buildTarget worker","taskType":"WorkTask","taskUpdatedAt":"2025-11-14T18:20:58.231039244Z"}
 {"taskCreatedAt":"2025-11-14T18:19:45.688391211Z","taskDependencies":[],"taskId":"t-1a1DdSB","taskNamespace":null,"taskParent":"t-19ZF6A8","taskStatus":"Done","taskTitle":"Replace forM with mapConcurrentlyBounded in build","taskType":"WorkTask","taskUpdatedAt":"2025-11-14T18:20:58.290149792Z"}
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