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.

1 files changed, 16 insertions, 24 deletions

diff --git a/Biz/Bild/Haskell.nix b/Biz/Bild/Haskell.nix
index 2c0529a..c744848 100644
--- a/Biz/Bild/Haskell.nix
+++ b/Biz/Bild/Haskell.nix
@@ -1,11 +1,10 @@
 _self: super:
 
 let
-  ghcCompiler = "ghc924";
+  inherit (import ./Constants.nix) ghcCompiler;
+
   buildCabal = sel: name: sel.callCabal2nix name super.sources.${name} { };
-  buildCabalSubdir = sel:
-    { name, src ? super.sources.${name}, subdir ? name }:
-    sel.callCabal2nix name (src + "/${subdir}") { };
+
 in rec {
 
   haskell = super.haskell // {
@@ -15,30 +14,23 @@ in rec {
           overrides = with super.pkgs.haskell.lib;
             sel: sup:
             super.overridePinnedDeps (buildCabal sel) // {
-              acid-state =
-                dontCheck sup.acid-state; # mac: "too many open files"
+              ap-normalize = dontCheck sup.ap-normalize;
               clay = doJailbreak sup.clay;
-              envy = doJailbreak sup.envy;
-              fast-tags =
-                sup.fast-tags.overrideAttrs (old: old // { patches = [ ]; });
-              generic-data = dontCheck
-                sup.generic-data; # https://github.com/Lysxia/generic-data/issues/56
-              readable =
-                doJailbreak sup.readable; # why is this even being built?
-              servant-auth = doJailbreak (buildCabalSubdir sel {
-                name = "servant-auth";
-                subdir = "servant-auth/servant-auth";
-              });
-              servant-server = doJailbreak sup.servant-server;
-              stripe-core = doJailbreak sup.stripe-core;
-              stripe-haskell = dontCheck sup.stripe-haskell;
-              stripe-http-client =
-                doJailbreak (dontCheck sup.stripe-http-client);
-              temporary = dontCheck sup.temporary;
-              wai-middleware-metrics = dontCheck sup.wai-middleware-metrics;
+              cmark = doJailbreak sup.cmark;
+              docopt = buildCabal sel "docopt";
+              linear-generics = doJailbreak sup.linear-generics;
+              req = doJailbreak sup.req;
+              servant-auth = doJailbreak sup.servant-auth;
+              servant-auth-server = dontCheck sup.servant-auth-server;
+              shellcheck = doJailbreak sup.shellcheck;
+              string-qq = doJailbreak sup.string-qq;
+              syb-with-class = doJailbreak sup.syb-with-class;
+              th-abstraction = doJailbreak sup.th-abstraction;
             };
         });
     };
   };
 
+  ormolu = super.haskellPackages.ormolu;
+
 }