refactor: upstream both required patches

learn-anything · Oct 16, 2024 · 5edd09c · 5edd09c
1 parent 19b5f0a
commit 5edd09c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/packages/server/default.nix b/packages/server/default.nix
@@ -9,6 +9,7 @@
   darwin,
   pkg-config,
   libiconv,
+  fetchpatch,
   defaultReleaseProfile ? false,
 }:
 let
@@ -57,7 +58,16 @@ let
   );
   totalArgs = commonArgs // {
     inherit cargoArtifacts;
-    patches = [ ./session_state.patch ] ++ lib.optional defaultReleaseProfile ./release.patch;
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/devflowinc/trieve/pull/2592.patch";
+        hash = "sha256-enDoYb+YoVqziOQdGuLksGwFF4fOFy+sWeMb8N7UmjY=";
+      })
+      (fetchpatch {
+        url = "https://github.com/devflowinc/trieve/pull/2590.patch";
+        hash = "sha256-H8lax4FM8VW+v5RoCRXVEz+ReZsfz1Tmq6BHBS90F0Q=";
+      })
+    ] ++ lib.optional defaultReleaseProfile ./release.patch;
   };
 in
 craneLib.buildPackage (

diff --git a/packages/server/session_state.patch b/packages/server/session_state.patch