python3Packages.llm-*: use llm in the dependencies

There's no circular dependency problems anymore.
This commit is contained in:
Philip Taron 2025-05-30 17:13:35 -07:00
parent 6fba136127
commit 42fa505cf7
33 changed files with 97 additions and 134 deletions

View file

@ -26,10 +26,12 @@ buildPythonPackage rec {
build-system = [ build-system = [
setuptools setuptools
llm
]; ];
dependencies = [ anthropic ]; dependencies = [
anthropic
llm
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook

View file

@ -27,13 +27,11 @@ buildPythonPackage rec {
# Only needed until https://github.com/simonw/llm-cmd/pull/18 is merged and released # Only needed until https://github.com/simonw/llm-cmd/pull/18 is merged and released
patches = [ ./fix-test.patch ]; patches = [ ./fix-test.patch ];
build-system = [
setuptools build-system = [ setuptools ];
# Follows the reasoning from https://github.com/NixOS/nixpkgs/pull/327800#discussion_r1681586659 about including llm in build-system
llm
];
dependencies = [ dependencies = [
llm
prompt-toolkit prompt-toolkit
pygments pygments
]; ];
@ -53,6 +51,9 @@ buildPythonPackage rec {
homepage = "https://github.com/simonw/llm-cmd"; homepage = "https://github.com/simonw/llm-cmd";
changelog = "https://github.com/simonw/llm-cmd/releases/tag/${version}"; changelog = "https://github.com/simonw/llm-cmd/releases/tag/${version}";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ erethon ]; maintainers = with lib.maintainers; [
erethon
philiptaron
];
}; };
} }

View file

@ -23,13 +23,13 @@ buildPythonPackage rec {
hash = "sha256-PxICRds9NJQP64HwoL7Oxd39yaIrMdAyQEbhaumJCgo="; hash = "sha256-PxICRds9NJQP64HwoL7Oxd39yaIrMdAyQEbhaumJCgo=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
dependencies = [
cohere
llm llm
]; ];
dependencies = [ cohere ];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
pytest-recording pytest-recording

View file

@ -19,12 +19,9 @@ buildPythonPackage rec {
hash = "sha256-yrNvIGnU9Q/0H786DsM0wGEwfxZYIk8IXhqC4mWaQAA="; hash = "sha256-yrNvIGnU9Q/0H786DsM0wGEwfxZYIk8IXhqC4mWaQAA=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ ]; dependencies = [ llm ];
pythonImportsCheck = [ "llm_deepseek" ]; pythonImportsCheck = [ "llm_deepseek" ];

View file

@ -19,10 +19,9 @@ buildPythonPackage rec {
hash = "sha256-+Ha6L2h8p/yA073MfO2Uvd6E4bKA2xAvaBWtvjqglOw="; hash = "sha256-+Ha6L2h8p/yA073MfO2Uvd6E4bKA2xAvaBWtvjqglOw=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm dependencies = [ llm ];
];
pythonImportsCheck = [ "llm_docs" ]; pythonImportsCheck = [ "llm_docs" ];

View file

@ -21,10 +21,9 @@ buildPythonPackage rec {
hash = "sha256-4345UIyaQx+mYYBAFD5AaX5YbjbnJQt8bKMD5Vl8VJc="; hash = "sha256-4345UIyaQx+mYYBAFD5AaX5YbjbnJQt8bKMD5Vl8VJc=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm dependencies = [ llm ];
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook

View file

@ -19,11 +19,9 @@ buildPythonPackage rec {
hash = "sha256-7i1WRix5AAEG5EXJqtaU+QY56aL0SePdqz84z+C+iYM="; hash = "sha256-7i1WRix5AAEG5EXJqtaU+QY56aL0SePdqz84z+C+iYM=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm dependencies = [ llm ];
];
dependencies = [ ];
pythonImportsCheck = [ "llm_fragments_github" ]; pythonImportsCheck = [ "llm_fragments_github" ];

View file

@ -20,11 +20,12 @@ buildPythonPackage rec {
hash = "sha256-1XqAmuZ1WMHD6JbLbLsK9K4Uf3FvvKJD4mn1G2J/3C8="; hash = "sha256-1XqAmuZ1WMHD6JbLbLsK9K4Uf3FvvKJD4mn1G2J/3C8=";
}; };
build-system = [ build-system = [ hatchling ];
hatchling
dependencies = [
httpx
llm llm
]; ];
dependencies = [ httpx ];
pythonImportsCheck = [ "llm_fragments_pypi" ]; pythonImportsCheck = [ "llm_fragments_pypi" ];

View file

@ -25,10 +25,9 @@ buildPythonPackage rec {
hash = "sha256-2xdvOpMGsTtnerrlGiVSHoJrM+GQ7Zgv+zn2SAwYAL4="; hash = "sha256-2xdvOpMGsTtnerrlGiVSHoJrM+GQ7Zgv+zn2SAwYAL4=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm dependencies = [ llm ];
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook

View file

@ -22,12 +22,12 @@ buildPythonPackage rec {
hash = "sha256-LECMHv4tGMCY60JU68y2Sfxp97Px7T/RJVhYVDSFCy4="; hash = "sha256-LECMHv4tGMCY60JU68y2Sfxp97Px7T/RJVhYVDSFCy4=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ symbex ]; dependencies = [
llm
symbex
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook

View file

@ -25,14 +25,12 @@ buildPythonPackage rec {
hash = "sha256-aCP0YjcghzpgceuZRKGTN15wm7OIPCwcJAJJBxh78f4="; hash = "sha256-aCP0YjcghzpgceuZRKGTN15wm7OIPCwcJAJJBxh78f4=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ dependencies = [
httpx httpx
ijson ijson
llm
]; ];
nativeCheckInputs = [ nativeCheckInputs = [

View file

@ -25,13 +25,11 @@ buildPythonPackage rec {
hash = "sha256-ihMOiQnTfgZKICVDoQHLOMahrd+GiB+HwWFBMyIcs0A="; hash = "sha256-ihMOiQnTfgZKICVDoQHLOMahrd+GiB+HwWFBMyIcs0A=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ dependencies = [
httpx httpx
llm
llama-cpp-python llama-cpp-python
]; ];

View file

@ -31,12 +31,12 @@ buildPythonPackage rec {
build-system = [ build-system = [
setuptools setuptools
llm
]; ];
dependencies = [ dependencies = [
click click
deepmerge deepmerge
llm
pyyaml pyyaml
rich rich
pygments pygments

View file

@ -25,12 +25,10 @@ buildPythonPackage rec {
hash = "sha256-OeeU/53XKucLCtGvnl5RWc/QqF0TprB/SO8pnnK5fdw="; hash = "sha256-OeeU/53XKucLCtGvnl5RWc/QqF0TprB/SO8pnnK5fdw=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ dependencies = [
llm
httpx httpx
httpx-sse httpx-sse
rich rich

View file

@ -22,10 +22,12 @@ buildPythonPackage rec {
build-system = [ build-system = [
setuptools setuptools
llm
]; ];
dependencies = [ groq ]; dependencies = [
groq
llm
];
pythonImportsCheck = [ "llm_groq" ]; pythonImportsCheck = [ "llm_groq" ];

View file

@ -19,11 +19,9 @@ buildPythonPackage rec {
hash = "sha256-pywx9TAN/mnGR6Vv6YsPhLO4R5Geagw/bcydQjvTH5s="; hash = "sha256-pywx9TAN/mnGR6Vv6YsPhLO4R5Geagw/bcydQjvTH5s=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm dependencies = [ llm ];
];
dependencies = [ ];
pythonImportsCheck = [ "llm_hacker_news" ]; pythonImportsCheck = [ "llm_hacker_news" ];

View file

@ -18,12 +18,9 @@ buildPythonPackage rec {
hash = "sha256-Mf/tbB9+UdmSRpulqv5Wagr8wjDcRrNs2741DNQZhO4="; hash = "sha256-Mf/tbB9+UdmSRpulqv5Wagr8wjDcRrNs2741DNQZhO4=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ ]; dependencies = [ llm ];
pythonImportsCheck = [ "llm_jq" ]; pythonImportsCheck = [ "llm_jq" ];

View file

@ -21,12 +21,9 @@ buildPythonPackage rec {
hash = "sha256-jtFSfGu3JhNUfTsspY+OFLTMt9jQrh6R05sK9KBOKTE="; hash = "sha256-jtFSfGu3JhNUfTsspY+OFLTMt9jQrh6R05sK9KBOKTE=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ ]; dependencies = [ llm ];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
@ -39,7 +36,7 @@ buildPythonPackage rec {
meta = { meta = {
description = "LLM plugin providing access to Mistral models using the Mistral API"; description = "LLM plugin providing access to Mistral models using the Mistral API";
homepage = "Interact with llama-server models"; homepage = "https://github.com/simonw/llm-llama-server";
changelog = "https://github.com/simonw/llm-llama-server/releases/tag/${version}/CHANGELOG.md"; changelog = "https://github.com/simonw/llm-llama-server/releases/tag/${version}/CHANGELOG.md";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ philiptaron ]; maintainers = with lib.maintainers; [ philiptaron ];

View file

@ -27,12 +27,12 @@ buildPythonPackage rec {
build-system = [ build-system = [
setuptools setuptools
llm
]; ];
dependencies = [ dependencies = [
httpx httpx
httpx-sse httpx-sse
llm
]; ];
nativeCheckInputs = [ nativeCheckInputs = [

View file

@ -32,14 +32,11 @@ buildPythonPackage rec {
hash = "sha256-iwrDqrPt/zwXypBwD7zDAcen4fQq6PXl7Xj5VUL2KWA="; hash = "sha256-iwrDqrPt/zwXypBwD7zDAcen4fQq6PXl7Xj5VUL2KWA=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
# Follows the reasoning from https://github.com/NixOS/nixpkgs/pull/327800#discussion_r1681586659 about including llm in build-system
llm
];
dependencies = [ dependencies = [
click click
llm
ollama ollama
pydantic pydantic
]; ];

View file

@ -25,12 +25,10 @@ buildPythonPackage rec {
hash = "sha256-UoUxCwR+qOUufHuS0gw6A5Q7sB77VO4HYuMjFGN7mhA="; hash = "sha256-UoUxCwR+qOUufHuS0gw6A5Q7sB77VO4HYuMjFGN7mhA=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ dependencies = [
llm
openai openai
]; ];

View file

@ -27,11 +27,11 @@ buildPythonPackage rec {
build-system = [ build-system = [
setuptools setuptools
llm
]; ];
dependencies = [ dependencies = [
httpx httpx
llm
openai openai
]; ];

View file

@ -23,12 +23,12 @@ buildPythonPackage rec {
hash = "sha256-UWtCPdKrGE93NNjCroct5fPhq1pWIkngXXtRb+BHm8k="; hash = "sha256-UWtCPdKrGE93NNjCroct5fPhq1pWIkngXXtRb+BHm8k=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ pymupdf ]; dependencies = [
llm
pymupdf
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook

View file

@ -23,13 +23,11 @@ buildPythonPackage rec {
hash = "sha256-FDDMItKFEYEptiL3EHKgKVxClqRU9RaM3uD3xP0F4OM="; hash = "sha256-FDDMItKFEYEptiL3EHKgKVxClqRU9RaM3uD3xP0F4OM=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ dependencies = [
einops einops
llm
sentence-transformers sentence-transformers
]; ];

View file

@ -19,12 +19,9 @@ buildPythonPackage rec {
hash = "sha256-tfkSjeT9WstUsNCtVr3fMzqELFCtfYphqf3xFGvHaV0="; hash = "sha256-tfkSjeT9WstUsNCtVr3fMzqELFCtfYphqf3xFGvHaV0=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ ]; dependencies = [ llm ];
pythonImportsCheck = [ "llm_templates_fabric" ]; pythonImportsCheck = [ "llm_templates_fabric" ];

View file

@ -19,12 +19,9 @@ buildPythonPackage rec {
hash = "sha256-SFXrvpKrvfIP0JmXQt6OZ52kne4AEtiggbshyac9XQc="; hash = "sha256-SFXrvpKrvfIP0JmXQt6OZ52kne4AEtiggbshyac9XQc=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ ]; dependencies = [ llm ];
pythonImportsCheck = [ "llm_templates_github" ]; pythonImportsCheck = [ "llm_templates_github" ];

View file

@ -23,10 +23,9 @@ buildPythonPackage rec {
hash = "sha256-Us9bPk2qpTlgJqQ0Cl9QdeqW+h8j+pmnkriM0WXEyyA="; hash = "sha256-Us9bPk2qpTlgJqQ0Cl9QdeqW+h8j+pmnkriM0WXEyyA=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm dependencies = [ llm ];
];
nativeCheckInputs = [ nativeCheckInputs = [
llm-echo llm-echo

View file

@ -23,12 +23,12 @@ buildPythonPackage rec {
hash = "sha256-Si3VcHnRUj8Q/N8pRhltPOM6K64TX9DBH/u4WQxQJjQ="; hash = "sha256-Si3VcHnRUj8Q/N8pRhltPOM6K64TX9DBH/u4WQxQJjQ=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ quickjs ]; dependencies = [
llm
quickjs
];
nativeCheckInputs = [ nativeCheckInputs = [
llm-echo llm-echo

View file

@ -23,12 +23,12 @@ buildPythonPackage rec {
hash = "sha256-IOmYu7zoim7Co/xIm5VLaGkCPI0o+2Nb2Pu3U2fH0BU="; hash = "sha256-IOmYu7zoim7Co/xIm5VLaGkCPI0o+2Nb2Pu3U2fH0BU=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ simpleeval ]; dependencies = [
llm
simpleeval
];
nativeCheckInputs = [ nativeCheckInputs = [
llm-echo llm-echo

View file

@ -22,10 +22,9 @@ buildPythonPackage rec {
hash = "sha256-VAmK4cXzZWTWCU92TwMdhNJPvYPZ88t5BZe8vo60SZY="; hash = "sha256-VAmK4cXzZWTWCU92TwMdhNJPvYPZ88t5BZe8vo60SZY=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm dependencies = [ llm ];
];
nativeCheckInputs = [ nativeCheckInputs = [
llm-echo llm-echo

View file

@ -19,12 +19,9 @@ buildPythonPackage rec {
hash = "sha256-vsb3oXGr+2FDJnTwYomICfald1ptben28hAJ8ypKiBI="; hash = "sha256-vsb3oXGr+2FDJnTwYomICfald1ptben28hAJ8ypKiBI=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ ]; dependencies = [ llm ];
# Reaches out to the real API # Reaches out to the real API
doCheck = false; doCheck = false;

View file

@ -19,12 +19,9 @@ buildPythonPackage rec {
hash = "sha256-brTyBymoFuvSQzsD/4aWzFGCrh3yEmWbpsUNGKT9dcU="; hash = "sha256-brTyBymoFuvSQzsD/4aWzFGCrh3yEmWbpsUNGKT9dcU=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
llm
];
dependencies = [ ]; dependencies = [ llm ];
pythonImportsCheck = [ "llm_video_frames" ]; pythonImportsCheck = [ "llm_video_frames" ];

View file

@ -36,9 +36,9 @@ buildPythonPackage rec {
]; ];
meta = { meta = {
description = "Ask questions of LLM documentation using LLM"; description = "Find the Python code for specified symbols";
homepage = "https://github.com/simonw/llm-docs"; homepage = "https://github.com/simonw/symbex";
changelog = "https://github.com/simonw/llm-docs/releases/tag/${version}/CHANGELOG.md"; changelog = "https://github.com/simonw/symbex/releases/tag/${version}/CHANGELOG.md";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ philiptaron ]; maintainers = with lib.maintainers; [ philiptaron ];
}; };