From c9672dbeb433e0575a4998df94b645150fb477f7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 8 Jan 2025 16:33:16 +0100
Subject: [PATCH] llm-ollama: move to pythonPackages as it is not an
 application

---
 .../python-modules/llm-ollama/default.nix}    | 22 ++++++++++++++-----
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 19 insertions(+), 5 deletions(-)
 rename pkgs/{by-name/ll/llm-ollama/package.nix => development/python-modules/llm-ollama/default.nix} (83%)

diff --git a/pkgs/by-name/ll/llm-ollama/package.nix b/pkgs/development/python-modules/llm-ollama/default.nix
similarity index 83%
rename from pkgs/by-name/ll/llm-ollama/package.nix
rename to pkgs/development/python-modules/llm-ollama/default.nix
index 2ab3d8023509..23760ce6f9d9 100644
--- a/pkgs/by-name/ll/llm-ollama/package.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -1,10 +1,22 @@
 {
   lib,
-  python3Packages,
+  buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  llm,
+
+  # dependencies
+  click,
+  ollama,
+  pydantic,
+
+  # tests
+  pytestCheckHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "llm-ollama";
   version = "0.8.1";
   pyproject = true;
@@ -16,20 +28,20 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-9AgHX2FJRXSKZOLt7JR/9Fg4i2HGNQY2vSsJa4+2BGQ=";
   };
 
-  build-system = with python3Packages; [
+  build-system = [
     setuptools
     # Follows the reasoning from https://github.com/NixOS/nixpkgs/pull/327800#discussion_r1681586659 about including llm in build-system
     llm
   ];
 
-  dependencies = with python3Packages; [
+  dependencies = [
     click
     ollama
     pydantic
   ];
 
   nativeCheckInputs = [
-    python3Packages.pytestCheckHook
+    pytestCheckHook
   ];
 
   # These tests try to access the filesystem and fail
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 219366808473..93bc9bfecaa0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7621,6 +7621,8 @@ self: super: with self; {
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };
 
+  llm-ollama = callPackage ../development/python-modules/llm-ollama { };
+
   llmx = callPackage ../development/python-modules/llmx { };
 
   llvmlite = callPackage ../development/python-modules/llvmlite {