From 44b1f8d5bc2ffcb00f56b0096476501e7e0cd458 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Aug 2023 17:57:42 -0400
Subject: Get ava.py running with nixified builds

I had to redo some of my python overrides and crib the bitsandbytes.nix
from upstream.

Ava is failing because:

    ValueError: Tokenizer class LlamaTokenizer does not exist or is not
    currently imported.

I think this means I need to update my nixpkgs pin, so I'm gonna
snapshot my work in git, do the update, and that might obviate the local
bitsandbytes.nix anyway.
---
 Biz/Bild/Deps.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Biz/Bild/Deps.nix')

diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 34be480..20a5e34 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -31,13 +31,16 @@ in rec
     };
   };
 
-  python3Packages = let
-    callPackage = super.python3Packages.callPackage;
-  in super.python3Packages // rec {
-    accelerate = callPackage ./Deps/accelerate.nix {};
-    bitsandbytes = callPackage ./Deps/bitsandbytes.nix {};
+  python3 = super.python3.override {
+    packageOverrides = _: pysuper: with pysuper.pkgs.python3Packages; {
+      accelerate = callPackage ./Deps/accelerate.nix {};
+      bitsandbytes = callPackage ./Deps/bitsandbytes.nix {};
+      lion-pytorch = callPackage ./Deps/lion-pytorch.nix {};
+    };
   };
 
+  python3Packages = python3.pkgs;
+
   autogen = super.callPackage ./Deps/autogen.nix {};
 
   gnutls = super.gnutls.override { guileBindings = true; };
-- 
cgit v1.2.3