From 21064e22609186814935ce49e5f226bdb0ba7142 Mon Sep 17 00:00:00 2001
From: abysssol <abysssol@pm.me>
Date: Sun, 1 Sep 2024 13:19:00 -0400
Subject: [PATCH] ollama: 0.3.5 -> 0.3.9

changelog 0.3.6: https://github.com/ollama/ollama/releases/tag/v0.3.6
changelog 0.3.7: https://github.com/ollama/ollama/releases/tag/v0.3.7
changelog 0.3.8: https://github.com/ollama/ollama/releases/tag/v0.3.8
changelog 0.3.9: https://github.com/ollama/ollama/releases/tag/v0.3.9
diff: https://github.com/ollama/ollama/compare/v0.3.5...v0.3.9
---
 pkgs/by-name/ol/ollama/disable-lib-check.patch | 10 ----------
 pkgs/by-name/ol/ollama/package.nix             |  8 ++------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/by-name/ol/ollama/disable-lib-check.patch

diff --git a/pkgs/by-name/ol/ollama/disable-lib-check.patch b/pkgs/by-name/ol/ollama/disable-lib-check.patch
deleted file mode 100644
index 8ce5fcb04e25..000000000000
--- a/pkgs/by-name/ol/ollama/disable-lib-check.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/llm/generate/gen_linux.sh
-+++ b/llm/generate/gen_linux.sh
-@@ -245,7 +245,6 @@
-     if [ $(cat "${BUILD_DIR}/bin/deps.txt" | wc -l ) -lt 8 ] ; then
-         cat "${BUILD_DIR}/bin/deps.txt"
-         echo "ERROR: deps file short"
--        exit 1
-     fi
-     compress
- fi
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 87a9a0af891a..968b65fd56ae 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -40,13 +40,13 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.3.5";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     rev = "v${version}";
-    hash = "sha256-2lPOkpZ9AmgDFoIHKi+Im1AwXnTxSY3LLtyui1ep3Dw=";
+    hash = "sha256-h/IFD7OaiIWNhJywqWG4uOPXExHfcnipr6f9YD1OjNc=";
     fetchSubmodules = true;
   };
 
@@ -63,7 +63,6 @@ let
     (preparePatch "05-default-pretokenizer.diff" "sha256-PQ0DgfzycUQ8t6S6/yjsMHHx/nFJ0w8AH6afv5Po89w=")
     (preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=")
     (preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
-    (preparePatch "08-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=")
     (preparePatch "09-lora.diff" "sha256-tNtI3WHHjBq+PJZGJCBsXHa15dlNJeJm+IiaUbFC0LE=")
     (preparePatch "11-phi3-sliding-window.diff" "sha256-VbcR4SLa9UXoh8Jq/bPVBerxfg68JZyWALRs7fz7hEs=")
   ];
@@ -179,9 +178,6 @@ goBuild (
       # this also disables necessary patches contained in `ollama/llm/patches/`
       # those patches are added to `llamacppPatches`, and reapplied here in the patch phase
       ./disable-git.patch
-      # disable a check that unnecessarily exits compilation during rocm builds
-      # since `rocmPath` is in `LD_LIBRARY_PATH`, ollama uses rocm correctly
-      ./disable-lib-check.patch
     ] ++ llamacppPatches;
     postPatch = ''
       # replace inaccurate version number with actual release version