From d9ed05173c8e872cfb9e712ecbcad92a2f4c8222 Mon Sep 17 00:00:00 2001
From: Lemon Lam <alemonmk@users.noreply.github.com>
Date: Mon, 8 Dec 2025 01:44:46 +0800
Subject: [PATCH] warpgate: 0.17.0 -> 0.18.0

---
 .../disable-rust-reproducible-build.patch        | 14 --------------
 pkgs/by-name/wa/warpgate/package.nix             | 16 ++++++++++------
 2 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch

diff --git a/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch b/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch
deleted file mode 100644
index 8db9aba1c95a..000000000000
--- a/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/.cargo/config.toml b/.cargo/config.toml
-index 8ab4225..8e0c812 100644
---- a/.cargo/config.toml
-+++ b/.cargo/config.toml
-@@ -1,8 +1,5 @@
- # https://github.com/rust-lang/cargo/issues/5376#issuecomment-2163350032
- [target.'cfg(all())']
- rustflags = [
--    "--cfg", "tokio_unstable",
--    "-Zremap-cwd-prefix=/reproducible-cwd",
--    "--remap-path-prefix=$HOME=/reproducible-home",
--    "--remap-path-prefix=$PWD=/reproducible-pwd",
-+    "--cfg", "tokio_unstable"
- ]
diff --git a/pkgs/by-name/wa/warpgate/package.nix b/pkgs/by-name/wa/warpgate/package.nix
index 440b3f762724..e3d5c44a3d5e 100644
--- a/pkgs/by-name/wa/warpgate/package.nix
+++ b/pkgs/by-name/wa/warpgate/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (
 
       patches = [ ./web-ui-package-json.patch ];
 
-      npmDepsHash = "sha256-1zCxKAH2IAKSFdL8Pyd8dJi0i8Y5mgYcWNKVpiQszc0=";
+      npmDepsHash = "sha256-jgsNF93DkEVgPGzdi192HKoSHPYhdrtog28jZvOLK6E=";
 
       nativeBuildInputs = [ openapi-generator-cli ];
 
@@ -35,29 +35,33 @@ rustPlatform.buildRustPackage (
   in
   {
     pname = "warpgate";
-    version = "0.17.0";
+    version = "0.18.0";
 
     src = fetchFromGitHub {
       owner = "warp-tech";
       repo = "warpgate";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-nr0z8c0o5u4Rqs9pFUaxnasRHUhwT3qQe5+JNV+LObg=";
+      hash = "sha256-GLY/VGEKB6gFNTbBlbhpmqQZ62pk2wd6JwWwy4Tz0FE=";
     };
 
-    cargoHash = "sha256-pIr5Z7rp+dYOuKYnlsBdya6MqAdL0U2gUhwXvLfmM34=";
+    cargoHash = "sha256-hwAtj8tTDsYgzuDobMg97wepKKIpohSVClyRiaDd+8w=";
 
     patches = [
       (replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; })
-      ./disable-rust-reproducible-build.patch
     ];
 
+    RUSTFLAGS = "--cfg tokio_unstable";
+
     buildFeatures = [
       "postgres"
       "mysql"
       "sqlite"
     ];
 
-    preBuild = ''ln -rs "${warpgate-web}" warpgate-web/dist'';
+    preBuild = ''
+      rm -r .cargo/
+      ln -rs "${warpgate-web}" warpgate-web/dist
+    '';
 
     # skip check, project included tests require python stuff and docker
     doCheck = false;