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/Deps/Haskell.nix | 3 ---
 Biz/Bild/Deps/exllama.nix | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'Biz/Bild/Deps')

diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix
index f34bfab..8115688 100644
--- a/Biz/Bild/Deps/Haskell.nix
+++ b/Biz/Bild/Deps/Haskell.nix
@@ -23,7 +23,6 @@
   "fast-logger"
   "filepath"
   "github"
-  "hashids"
   "haskeline"
   "hostname"
   "http-types"
@@ -31,7 +30,6 @@
   "katip"
   "lucid"
   "monad-logger"
-  "monad-metrics"
   "mtl"
   "neat-interpolation"
   "network-uri"
@@ -53,7 +51,6 @@
   "servant-server"
   "split"
   "stm"
-  "stripe-haskell"
   "tasty"
   "tasty-hunit"
   "tasty-quickcheck"
diff --git a/Biz/Bild/Deps/exllama.nix b/Biz/Bild/Deps/exllama.nix
index 51a05e9..434e9a9 100644
--- a/Biz/Bild/Deps/exllama.nix
+++ b/Biz/Bild/Deps/exllama.nix
@@ -1,7 +1,7 @@
 { lib, sources, buildPythonPackage, pythonOlder
 , torch # tested on 2.0.1 and 2.1.0 (nightly) with cu118
 , safetensors, sentencepiece, ninja, cudaPackages, addOpenGLRunpath, which
-, gcc11 # cuda 11.7 requires g++ <12
+, libGL, gcc11 # cuda 11.7 requires g++ <12
 }:
 
 buildPythonPackage rec {
@@ -23,6 +23,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     gcc11
     which
+    libGL
     addOpenGLRunpath
     cudaPackages.cuda_nvcc
     cudaPackages.cuda_cudart
-- 
cgit v1.2.3