From ca97467e34648472601988813048fadbf344c5c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 May 2024 10:28:18 +0200
Subject: [PATCH 1/3] python312Packages.ollama: 0.1.9 -> 0.2.0

Diff: https://github.com/ollama/ollama-python/compare/refs/tags/v0.1.9...v0.2.0

Changelog: https://github.com/ollama/ollama-python/releases/tag/v0.2.0
---
 pkgs/development/python-modules/ollama/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index 4d1999a8aae8..299af4e9c964 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "ollama";
-  version = "0.1.9";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "ollama";
     repo = "ollama-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ilJgRMzCn/T+6Lr7IuvaCnKhN5cyyEOWuV0N1FtR+Yg=";
+    hash = "sha256-kfotKUUXBekUd0X32BYAjNWvQJO94bdEDCSrBg2yJRQ=";
   };
 
   postPatch = ''

From 2bf80d3430aaaeeea08b266c7f8abb5ecbb7679e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 May 2024 10:37:27 +0200
Subject: [PATCH 2/3] oterm: 0.2.7 -> 0.2.8

Diff: https://github.com/ggozad/oterm/compare/refs/tags/0.2.7...0.2.8

Changelog: https://github.com/ggozad/oterm/releases/tag/0.2.8
---
 pkgs/by-name/ot/oterm/package.nix | 40 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index 797ca5a05823..23074ce200c5 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -5,44 +5,48 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.2.7";
+  version = "0.2.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     rev = "refs/tags/${version}";
-    hash = "sha256-vKVGSIneKQkFO1uoNaW/Yr6QTDhgokmIpkYFYIbm+U4=";
+    hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk=";
   };
 
   pythonRelaxDeps = [
     "aiosqlite"
-    "pillow"
     "httpx"
+    "ollama"
     "packaging"
+    "pillow"
     "typer"
   ];
 
-  propagatedBuildInputs = with python3Packages; [
-    ollama
-    textual
-    typer
-    python-dotenv
-    httpx
-    aiosql
-    aiosqlite
-    pyperclip
-    packaging
-    rich-pixels
-    pillow
-    aiohttp
+  build-system = with python3Packages; [
+    poetry-core
   ];
 
   nativeBuildInputs = with python3Packages; [
-    poetry-core
     pythonRelaxDepsHook
   ];
 
+  propagatedBuildInputs = with python3Packages; [
+    aiohttp
+    aiosql
+    aiosqlite
+    httpx
+    ollama
+    packaging
+    pillow
+    pyperclip
+    python-dotenv
+    rich-pixels
+    textual
+    typer
+  ];
+
   pythonImportsCheck = [
     "oterm"
   ];
@@ -51,9 +55,9 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   meta = {
-    changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
     description = "A text-based terminal client for Ollama";
     homepage = "https://github.com/ggozad/oterm";
+    changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
     license = lib.licenses.mit;
     mainProgram = "oterm";
     maintainers = with lib.maintainers; [ suhr ];

From 81dd1c32dd6af2f3f0848f18ca4ddd2f7d842e22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 May 2024 10:37:44 +0200
Subject: [PATCH 3/3] oterm: format with nixfmt

---
 pkgs/by-name/ot/oterm/package.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index 23074ce200c5..c321aca86236 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, python3Packages
-, fetchFromGitHub
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -24,13 +25,9 @@ python3Packages.buildPythonApplication rec {
     "typer"
   ];
 
-  build-system = with python3Packages; [
-    poetry-core
-  ];
+  build-system = with python3Packages; [ poetry-core ];
 
-  nativeBuildInputs = with python3Packages; [
-    pythonRelaxDepsHook
-  ];
+  nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];
 
   propagatedBuildInputs = with python3Packages; [
     aiohttp
@@ -47,9 +44,7 @@ python3Packages.buildPythonApplication rec {
     typer
   ];
 
-  pythonImportsCheck = [
-    "oterm"
-  ];
+  pythonImportsCheck = [ "oterm" ];
 
   # Tests require a HTTP connection to ollama
   doCheck = false;