fix(clickhouse): use devflowinc/trieve#2625 patch

learn-anything · Oct 19, 2024 · 173869e · 173869e
1 parent e948e43
commit 173869e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/packages/common.nix b/packages/common.nix
@@ -4,7 +4,7 @@ rec {
     owner = "devflowinc";
     repo = "trieve";
     # rev = "v${version}";
-    rev = "23db60f15428805fbec847123c1907fb31f88d57";
-    hash = "sha256-luEgbpfNt4vvcNf3TaLmOei0PwYAA22KAH35mPhx8fg=";
+    rev = "bc302dc0848adbeb492e915a37a35e2d1536a35e";
+    hash = "sha256-SSV+d75SEY6hZuC0fpaD5LBUDeOvAdJgme2yQlOybEY=";
   };
 }
diff --git a/packages/server/default.nix b/packages/server/default.nix
@@ -69,18 +69,23 @@ let
         hash = "sha256-fRKHMcpRxUBpLsoQUEAxxR5fSFXj3WkOaLIH2vTKszI=";
         relative = "server";
       })
+      (fetchpatch2 {
+        url = "https://github.com/devflowinc/trieve/pull/2625.patch";
+        hash = "sha256-aCOfsp3ZH9ZrCglOtVN0lfB5kBx/aKEp8eEphjhQ2xQ=";
+        relative = "server";
+      })
     ] ++ lib.optional defaultReleaseProfile ./release.patch;
   };
 in
 craneLib.buildPackage (
   totalArgs
   // {
     postInstall = ''
-      mkdir -p "$out/share/trieve"
-      cp -R ./migrations/ "$out/share/trieve"
-      cp -R ./ch_migrations/ "$out/share/trieve"
-      mkdir -p "$out/share/trieve/src/"
-      cp -R ./src/public/ "$out/share/trieve/src/"
+      mkdir -p "$out/share/"
+      cp -R ./migrations/ "$out/share/"
+      cp -R ./ch_migrations/ "$out/share/"
+      mkdir -p "$out/share/src/"
+      cp -R ./src/public/ "$out/share/src/"
     '';
   }
 )