summaryrefslogtreecommitdiff
path: root/Omni/Bild/Nixpkgs.nix
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2025-02-04 21:18:03 -0500
committerBen Sima <ben@bsima.me>2025-02-04 21:18:03 -0500
commit9f5b334eb6d0f64460f14d76255b096777a46332 (patch)
treedb357ca2a933456e1f35c17a1c85000fb5a64b9d /Omni/Bild/Nixpkgs.nix
parent86ea51353c223cdc82cb8ebd013d58d70a7e646a (diff)
Update ollama, llm-ollama, openai-python, llm
I couldn't use llm-ollama because it required some package upgrades, so I started going down that rabbit hole and ended up 1) realizing that these packages are way out of date now, and 2) fiddling with overrides to get everything to work. I finally figured it out, the `postPatch` in ollama-python was throwing me off for like half a day. Anyway, one thing to note is that these are changing fast and I need to either move onto nixpkgs unstable for python stuff, or maintain my own builds of all of these. Not sure which is more appropriate right now. Oh and I had to fixup some logging stuff in Biz/Storybook.py because ruff started complaining about something, which is weird because I don't think the version changed? But it was easy enough to change.
Diffstat (limited to 'Omni/Bild/Nixpkgs.nix')
-rw-r--r--Omni/Bild/Nixpkgs.nix52
1 files changed, 31 insertions, 21 deletions
diff --git a/Omni/Bild/Nixpkgs.nix b/Omni/Bild/Nixpkgs.nix
index fb9a6b1..3418673 100644
--- a/Omni/Bild/Nixpkgs.nix
+++ b/Omni/Bild/Nixpkgs.nix
@@ -15,25 +15,35 @@ let
# package overlays, because of the 'null' from 'overrideSource'
depsOverlay = _: pkgs: pkgs.overridePinnedDeps pkgs.overrideSource;
- overlays = [
- (_: _: {inherit sources;})
- (import ./CcacheWrapper.nix)
- (import ./Functions.nix)
- depsOverlay
- (import ./Deps.nix)
- (import ./Python.nix)
- (import ./Haskell.nix)
- # backport newer packages from unstable
- (_: _: {unstable = nixos-unstable-small.pkgs;})
- (import "${sources.nvidia-patch-nixos}/overlay.nix")
- ];
+ this = {
+ nixos-24_11 = import sources.nixos-24_11 {
+ inherit system config;
+ overlays = [
+ (_: _: {inherit sources;})
+ (import ./CcacheWrapper.nix)
+ (import ./Functions.nix)
+ depsOverlay
+ (_: _: {unstable = this.nixos-unstable-small.pkgs;})
+ (import ./Deps.nix)
+ (import ./Python.nix)
+ (import ./Haskell.nix)
+ (import "${sources.nvidia-patch-nixos}/overlay.nix")
+ ];
+ };
- nixos-unstable-small =
- import sources.nixos-unstable-small {inherit system config overlays;};
-in {
- nixos-24_05 = import sources.nixos-24_05 {inherit system config overlays;};
-
- nixos-24_11 = import sources.nixos-24_11 {inherit system config overlays;};
-
- inherit nixos-unstable-small;
-}
+ nixos-unstable-small = import sources.nixos-unstable-small {
+ inherit system config;
+ overlays = [
+ (_: _: {inherit sources;})
+ (import ./CcacheWrapper.nix)
+ (import ./Functions.nix)
+ depsOverlay
+ (import ./Deps.nix)
+ (import ./Python.nix)
+ (import ./Haskell.nix)
+ (import "${sources.nvidia-patch-nixos}/overlay.nix")
+ ];
+ };
+ };
+in
+ this