python3Packages.llm-*: use llm in the dependencies

There's no circular dependency problems anymore.

pkgs/development/python-modules/llm-anthropic/default.nix

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

pkgs/development/python-modules/llm-cmd/default.nix

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

pkgs/development/python-modules/llm-command-r/default.nix

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

pkgs/development/python-modules/llm-deepseek/default.nix

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

pkgs/development/python-modules/llm-docs/default.nix

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

pkgs/development/python-modules/llm-echo/default.nix

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

pkgs/development/python-modules/llm-fragments-github/default.nix

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

pkgs/development/python-modules/llm-fragments-pypi/default.nix

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

pkgs/development/python-modules/llm-fragments-reader/default.nix

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

pkgs/development/python-modules/llm-fragments-symbex/default.nix

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

pkgs/development/python-modules/llm-gemini/default.nix

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

pkgs/development/python-modules/llm-gguf/default.nix

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

pkgs/development/python-modules/llm-git/default.nix

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

pkgs/development/python-modules/llm-grok/default.nix

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

pkgs/development/python-modules/llm-groq/default.nix

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

pkgs/development/python-modules/llm-hacker-news/default.nix

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

pkgs/development/python-modules/llm-jq/default.nix

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

pkgs/development/python-modules/llm-llama-server/default.nix

@@ -21,12 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-jtFSfGu3JhNUfTsspY+OFLTMt9jQrh6R05sK9KBOKTE=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -39,7 +36,7 @@ buildPythonPackage rec {
 
   meta = {
     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";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ philiptaron ];

pkgs/development/python-modules/llm-mistral/default.nix

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

pkgs/development/python-modules/llm-ollama/default.nix

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

pkgs/development/python-modules/llm-openai-plugin/default.nix

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

pkgs/development/python-modules/llm-openrouter/default.nix

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

pkgs/development/python-modules/llm-pdf-to-images/default.nix

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

pkgs/development/python-modules/llm-sentence-transformers/default.nix

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

pkgs/development/python-modules/llm-templates-fabric/default.nix

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

pkgs/development/python-modules/llm-templates-github/default.nix

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

pkgs/development/python-modules/llm-tools-datasette/default.nix

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

pkgs/development/python-modules/llm-tools-quickjs/default.nix

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

pkgs/development/python-modules/llm-tools-simpleeval/default.nix

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

pkgs/development/python-modules/llm-tools-sqlite/default.nix

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

pkgs/development/python-modules/llm-venice/default.nix

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

pkgs/development/python-modules/llm-video-frames/default.nix

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

pkgs/development/python-modules/symbex/default.nix

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