From bd0f6eabe5499ad2f457a791f42610c15204f9ff Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Sun, 22 Dec 2024 01:47:32 +0100
Subject: [PATCH] gpt4all: 3.4.2 -> 3.6.1

---
 pkgs/by-name/gp/gpt4all/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix
index 118df97d6797b4..632cd6337696df 100644
--- a/pkgs/by-name/gp/gpt4all/package.nix
+++ b/pkgs/by-name/gp/gpt4all/package.nix
@@ -6,6 +6,7 @@
   fetchurl,
   fetchpatch,
   cmake,
+  expected-lite,
   qt6,
   fmt,
   shaderc,
@@ -18,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpt4all";
-  version = "3.4.2";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
-    hash = "sha256-QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM=";
+    hash = "sha256-eJVwLHER3Ch9dnxubSUJFvE1MHt0ywvcYr5s2p2W7X8=";
     owner = "nomic-ai";
     repo = "gpt4all";
     rev = "v${finalAttrs.version}";
@@ -35,12 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./embedding-local.patch
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051";
-      sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU=";
-      # remove the `gpt4all-chat` part of the paths as sourceRoot is gpt4all-chat
-      stripLen = 1;
-    })
   ];
 
   sourceRoot = "${finalAttrs.src.name}/gpt4all-chat";
@@ -57,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
+      expected-lite
       fmt
       qt6.qtwayland
       qt6.qtquicktimeline
@@ -85,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
       "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF"
       "-DGGML_VULKAN=ON"
       "-DGGML_KOMPUTE=ON"
+      "-DJINJA2CPP_DEPS_MODE=external"
     ]
     ++ lib.optionals (!cudaSupport) [
       "-DLLMODEL_CUDA=OFF"