diff options
Diffstat (limited to 'Omni')
| -rw-r--r-- | Omni/Bild.nix | 17 | ||||
| -rw-r--r-- | Omni/Bild/Deps.nix | 12 | ||||
| -rw-r--r-- | Omni/Bild/Python.nix | 5 | ||||
| -rw-r--r-- | Omni/Bild/Sources.json | 20 |
4 files changed, 32 insertions, 22 deletions
diff --git a/Omni/Bild.nix b/Omni/Bild.nix index bdaefd6..8c10fbe 100644 --- a/Omni/Bild.nix +++ b/Omni/Bild.nix @@ -113,7 +113,7 @@ bc cmark universal-ctags - #datasette + datasette deadnix fd figlet @@ -136,14 +136,11 @@ tree wemux ; - #aider-chat = unstable.aider-chat; + aider-chat = unstable.aider-chat; llama-cpp = unstable.llama-cpp; - # can't put this in the dev namespace because it pulls in openai with - # python311, which conflicts with any other usage of openai with - # python312. so i need to make a target that exposese/wraps llm like i did - # with llamacpp - #llm = python311.withPackages - # (p: [ p.llm p.llm-ollama p.llm-sentence-transformers ]); + llm = + python311.withPackages + (p: [p.llm p.llm-ollama p.llm-sentence-transformers]); ollama = unstable.ollama; ruff = unstable.ruff; shellcheck = unstable.shellcheck; @@ -248,11 +245,11 @@ name = "omnidev"; # this should just be dev tools buildInputs = with self.pkgs; [ - #aider-chat + aider-chat bat bc self.bild - #datasette + datasette universal-ctags fd figlet diff --git a/Omni/Bild/Deps.nix b/Omni/Bild/Deps.nix index b410f3b..ca296d4 100644 --- a/Omni/Bild/Deps.nix +++ b/Omni/Bild/Deps.nix @@ -1,9 +1,13 @@ -_self: super: { +_self: super: let + dontCheck = drv: drv.overrideAttrs (_: {doCheck = false;}); +in { cgit = super.overrideSrc super.cgit super.sources.cgit; # Needs upgrading for guile 3 # inspekt3d = super.callPackage ./Deps/inspekt3d.nix {}; + gupnp = dontCheck super.gupnp; + guix = super.pkgs.stdenv.mkDerivation rec { pname = "guix"; name = "${pname}-${version}"; @@ -28,5 +32,9 @@ _self: super: { nostr-rs-relay = super.callPackage ./Deps/nostr-rs-relay.nix {}; - radicale = super.radicale.overrideAttrs (_old: {doCheck = false;}); + radicale = dontCheck super.radicale; + + thrift = dontCheck super.thrift; + + valkey = dontCheck super.valkey; } diff --git a/Omni/Bild/Python.nix b/Omni/Bild/Python.nix index 7ae9aa9..5d1705a 100644 --- a/Omni/Bild/Python.nix +++ b/Omni/Bild/Python.nix @@ -4,6 +4,9 @@ _self: super: { with pysuper.pkgs.python312Packages; let dontCheck = p: p.overridePythonAttrs (_: {doCheck = false;}); in { + aider-chat = pysuper.aider-chat.withOptional {withAll = false;}; + aiohttp = dontCheck pysuper.aiohttp; + anthropic = dontCheck pysuper.anthropic; anyio = dontCheck pysuper.anyio; interegular = callPackage ./Deps/interegular.nix {}; ipython = dontCheck pysuper.ipython; @@ -24,7 +27,9 @@ _self: super: { --replace-fail "0.0.0" "${version}" ''; }); + onnx = dontCheck pysuper.onnx; outlines = callPackage ./Deps/outlines.nix {}; + psycopg = dontCheck pysuper.psycopg; pydantic-ai = callPackage ./Deps/pydantic-ai.nix {}; pydantic-ai-slim = callPackage ./Deps/pydantic-ai-slim.nix {}; pydantic-graph = callPackage ./Deps/pydantic-graph.nix {}; diff --git a/Omni/Bild/Sources.json b/Omni/Bild/Sources.json index 93abac1..51655d3 100644 --- a/Omni/Bild/Sources.json +++ b/Omni/Bild/Sources.json @@ -79,12 +79,12 @@ "homepage": "https://llm.datasette.io", "owner": "simonw", "repo": "llm", - "rev": "41d64a8f1239322e12aa11c17450054f0c654ed7", - "sha256": "1vyg0wmcxv8910iz4cx9vjb3y4fq28423p62cgzr308ra8jii719", + "rev": "0.25", + "sha256": "16rhqvgyz6f1ly2kmpgn6vhghafi9kwyw9sjccnq5h39az8lyzc8", "type": "tarball", - "url": "https://github.com/simonw/llm/archive/41d64a8f1239322e12aa11c17450054f0c654ed7.tar.gz", + "url": "https://github.com/simonw/llm/archive/0.25.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz", - "version": "0.21" + "version": "0.25" }, "logfire": { "branch": "main", @@ -152,10 +152,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", - "sha256": "0j3jd82iyyck4hpmz7pkak1v27l7pydl0c3vvyz6wfpi612x8xzi", + "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", + "sha256": "1mcp4s3qbvgcbyczy311vmc4fbkdx35c0f6piqh884c0ci09ynvc", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/7105ae3957700a9646cc4b766f5815b23ed0c682.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/8eb3b6a2366a7095939cd22f0dc0e9991313294b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixos-mailserver": { @@ -174,10 +174,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "0a072c9decccf3a97974db48cda1457bfaf5d5c5", - "sha256": "0wvwkadd6d7vznb0lwclzxqz9cpr7zb0b27xbdxc6kgmgi4sfbw2", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", + "sha256": "1a2qvp2yz8j1jcggl1yvqmdxicbdqq58nv7hihmw3bzg9cjyqm26", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/0a072c9decccf3a97974db48cda1457bfaf5d5c5.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/e4b09e47ace7d87de083786b404bf232eb6c89d8.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nvidia-patch-nixos": { |