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/Namespace.hs | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

(limited to 'Biz/Namespace.hs')

diff --git a/Biz/Namespace.hs b/Biz/Namespace.hs
index 8f5058e..aa69a9c 100644
--- a/Biz/Namespace.hs
+++ b/Biz/Namespace.hs
@@ -130,20 +130,34 @@ rePath = Regex.many (name <* Regex.string "/" <|> name)
 
 reExt :: Regex.RE Char Ext
 reExt =
-  C <$ Regex.string "c"
-    <|> Css <$ Regex.string "css"
-    <|> Hs <$ Regex.string "hs"
-    <|> Html <$ Regex.string "html"
-    <|> Json <$ Regex.string "json"
-    <|> Keys <$ Regex.string "pub"
-    <|> Lisp <$ Regex.string "lisp"
-    <|> Md <$ Regex.string "md"
-    <|> Nix <$ Regex.string "nix"
-    <|> Py <$ Regex.string "py"
-    <|> Rs <$ Regex.string "rs"
-    <|> Scm <$ Regex.string "scm"
-    <|> Sh <$ Regex.string "sh"
-    <|> Toml <$ Regex.string "toml"
+  C
+    <$ Regex.string "c"
+    <|> Css
+    <$ Regex.string "css"
+    <|> Hs
+    <$ Regex.string "hs"
+    <|> Html
+    <$ Regex.string "html"
+    <|> Json
+    <$ Regex.string "json"
+    <|> Keys
+    <$ Regex.string "pub"
+    <|> Lisp
+    <$ Regex.string "lisp"
+    <|> Md
+    <$ Regex.string "md"
+    <|> Nix
+    <$ Regex.string "nix"
+    <|> Py
+    <$ Regex.string "py"
+    <|> Rs
+    <$ Regex.string "rs"
+    <|> Scm
+    <$ Regex.string "scm"
+    <|> Sh
+    <$ Regex.string "sh"
+    <|> Toml
+    <$ Regex.string "toml"
 
 -- | The cab dir is for temporary files and build outputs, not for source
 -- inputs.
-- 
cgit v1.2.3