From d71c6f8c5955e8a9861e3f3957b293a369aac954 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Fri, 3 May 2024 22:34:10 -0400
Subject: Switch to nixpkgs-23.11, ghc 9.6.3

This brings a bunch of improvements. I got rid of some custom packages, I can
now build exllama without using a non-default cuda version. Oh yeah and I get to
use GHC 9.6.2 now, a huge upgrade from 9.4. Unfortunately I also updated ormolu
and some unrelated formatting changed, but that's life I guess.
---
 Biz/Bild.hs | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'Biz/Bild.hs')

diff --git a/Biz/Bild.hs b/Biz/Bild.hs
index 1ca0a2c..bae0328 100644
--- a/Biz/Bild.hs
+++ b/Biz/Bild.hs
@@ -198,7 +198,8 @@ test_bildExamples =
 move :: Cli.Arguments -> IO ()
 move args =
   IO.hSetBuffering stdout IO.NoBuffering
-    >> Env.getEnv "CODEROOT" +> \root ->
+    >> Env.getEnv "CODEROOT"
+    +> \root ->
       Cli.getAllArgs args (Cli.argument "target")
         |> filterM Dir.doesFileExist
         +> filterM (\x -> isGitIgnored x /> don't)
@@ -344,7 +345,7 @@ data Compiler
   | Sbcl
   deriving (Eq, Show, Generic)
 
-compilerExe :: IsString a => Compiler -> a
+compilerExe :: (IsString a) => Compiler -> a
 compilerExe = \case
   Copy -> "cp"
   CPython -> "python"
@@ -534,7 +535,7 @@ analyze hmap ns = case Map.lookup ns hmap of
         withFile abspath ReadMode <| \h ->
           IO.hSetEncoding h IO.utf8_bom
             >> Text.IO.hGetContents h
-              /> Text.lines
+            /> Text.lines
       case ext of
         -- basically we don't support building these
         Namespace.Css -> pure Nothing
@@ -724,10 +725,10 @@ analyze hmap ns = case Map.lookup ns hmap of
                            "guile -C \""
                              <> root
                              </> intdir
-                               <> "\" -e main "
-                               <> "-s "
-                               <> Namespace.toPath namespace
-                               <> " \"$@\""
+                             <> "\" -e main "
+                             <> "-s "
+                             <> Namespace.toPath namespace
+                             <> " \"$@\""
                          ]
                            |> joinWith "\n"
                            |> Text.pack
@@ -950,7 +951,7 @@ data Proc = Proc
   }
 
 -- | Convert minutes to milliseconds.
-toMillis :: Num a => a -> a
+toMillis :: (Num a) => a -> a
 toMillis mins = mins * 60_000_000
 
 -- | Run a subprocess, streaming output if --loud is set.
@@ -959,23 +960,24 @@ run Proc {..} = do
   IO.hSetBuffering stdout IO.NoBuffering
   loud ?| Log.info ["proc", unwords <| map str <| cmd : args]
   Conduit.proc cmd args
-    |> (\proc -> proc {Process.create_group = True})
+    |> (\proc_ -> proc_ {Process.create_group = True})
     |> Conduit.streamingProcess
     +> \(Conduit.UseProvidedHandle, stdout_, stderr_, hdl) ->
-      (,,) </ Async.Concurrently (Conduit.waitForStreamingProcess hdl)
+      (,,)
+        </ Async.Concurrently (Conduit.waitForStreamingProcess hdl)
         <*> Async.Concurrently (loud ?: (puts stdout_, logs ns stdout_))
         <*> Async.Concurrently (loud ?: (puts stderr_, logs ns stderr_))
-          |> Async.runConcurrently
-          +> \case
-            (Exit.ExitFailure n, output, outerr) ->
-              Conduit.closeStreamingProcessHandle hdl
-                >> putStr outerr
-                >> onFailure
-                >> pure (Exit.ExitFailure n, output)
-            (Exit.ExitSuccess, output, _) ->
-              Conduit.closeStreamingProcessHandle hdl
-                >> onSuccess
-                >> pure (Exit.ExitSuccess, output)
+        |> Async.runConcurrently
+        +> \case
+          (Exit.ExitFailure n, output, outerr) ->
+            Conduit.closeStreamingProcessHandle hdl
+              >> putStr outerr
+              >> onFailure
+              >> pure (Exit.ExitFailure n, output)
+          (Exit.ExitSuccess, output, _) ->
+            Conduit.closeStreamingProcessHandle hdl
+              >> onSuccess
+              >> pure (Exit.ExitSuccess, output)
 
 -- | Helper for running a standard bild subprocess.
 proc ::
-- 
cgit v1.2.3